From 0b0d7c6f1abcb0a52bc44a8bce75b32f881f5837 Mon Sep 17 00:00:00 2001
From: Ali Raza <soundsofnation29@gmail.com>
Date: Sat, 30 May 2026 22:20:48 +0500
Subject: [PATCH 1/5] docs: add Cashier Settlement feature and update related
 documentation

---
 docs/features/00-overview.md           |   1 +
 docs/features/07-draft-orders.md       |   1 +
 docs/features/24-pos-profile-config.md |  12 +++
 docs/features/25-keyboard-shortcuts.md |  13 +++
 docs/features/26-cashier-settlement.md | 113 +++++++++++++++++++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 docs/features/26-cashier-settlement.md

diff --git a/docs/features/00-overview.md b/docs/features/00-overview.md
index 97701fe..1ab76d1 100755
--- a/docs/features/00-overview.md
+++ b/docs/features/00-overview.md
@@ -32,6 +32,7 @@
 | 23 | [Product Bundles](23-product-bundles.md) | Bundle items with component expansion |
 | 24 | [POS Profile Configuration](24-pos-profile-config.md) | Complete POS Profile settings reference |
 | 25 | [Keyboard Shortcuts](25-keyboard-shortcuts.md) | Full keyboard shortcut reference |
+| 26 | [Cashier Settlement](26-cashier-settlement.md) | Create bills at the terminal, collect payment at a separate cashier |
 
 ---
 
diff --git a/docs/features/07-draft-orders.md b/docs/features/07-draft-orders.md
index 7a63093..1d3a69c 100755
--- a/docs/features/07-draft-orders.md
+++ b/docs/features/07-draft-orders.md
@@ -92,3 +92,4 @@ The dialog shows all held orders for the current shift:
 - Draft invoices are automatically cleaned up based on your profile settings
 - Use draft orders to manage busy periods efficiently
 - Each draft shows the customer name, item count, and total for quick identification
+- Held orders and [Cashier Settlement](26-cashier-settlement.md) bills are kept separate — bills sent to a cashier do not appear in the held-orders list, and vice versa
diff --git a/docs/features/24-pos-profile-config.md b/docs/features/24-pos-profile-config.md
index c8a3a90..c1bfeb4 100755
--- a/docs/features/24-pos-profile-config.md
+++ b/docs/features/24-pos-profile-config.md
@@ -73,6 +73,8 @@ The POS Profile is the central configuration hub for X POS. It controls every as
 | Use POS Invoice | Use POS Invoice instead of Sales Invoice |
 | Allow Multi Currency | Enable multi-currency transactions |
 | Block Sale Beyond Available Qty | Prevent selling beyond available stock |
+| Enable Cashier Settlement | Create unsettled bills at the terminal for a cashier to settle later (see [Cashier Settlement](26-cashier-settlement.md)) |
+| Print Backup Receipt | Print a non-genuine backup receipt at the terminal when a bill is sent to the cashier |
 
 ---
 
@@ -180,6 +182,16 @@ In addition to the X POS settings, the standard POS Profile provides:
 
 ---
 
+## User Access (Applicable for Users)
+
+The **Applicable for Users** table assigns users to the POS Profile. X POS adds one field to each row:
+
+| Field | Description |
+|---|---|
+| Is Cashier | Allows this user to open the Cashier screen and settle bills. See [Cashier Settlement](26-cashier-settlement.md). |
+
+---
+
 ## Configuration Tips
 
 - Start with a minimal configuration and enable features as needed
diff --git a/docs/features/25-keyboard-shortcuts.md b/docs/features/25-keyboard-shortcuts.md
index f6e5a1b..c9b497b 100755
--- a/docs/features/25-keyboard-shortcuts.md
+++ b/docs/features/25-keyboard-shortcuts.md
@@ -62,6 +62,19 @@ X POS is designed for fast operation with extensive keyboard support for power u
 
 ---
 
+## Cashier Settlement
+
+| Key | Action | Context |
+|---|---|---|
+| `Alt+0` | Open the Cashier screen | Anywhere (cashier users only) |
+| `↑` (Up Arrow) | Highlight previous unsettled bill | Cashier screen |
+| `↓` (Down Arrow) | Highlight next unsettled bill | Cashier screen |
+| `Enter` | Open the payment dialog to settle the highlighted bill | Cashier screen |
+
+See [Cashier Settlement](26-cashier-settlement.md) for the full workflow.
+
+---
+
 ## Workflow Examples
 
 ### Fast Checkout (Keyboard Only)
diff --git a/docs/features/26-cashier-settlement.md b/docs/features/26-cashier-settlement.md
new file mode 100644
index 0000000..46a2826
--- /dev/null
+++ b/docs/features/26-cashier-settlement.md
@@ -0,0 +1,113 @@
+# Cashier Settlement
+
+Cashier Settlement separates the act of **creating a bill** from the act of **collecting payment**. A POS terminal operator builds the order and sends it to a cashier, who collects the money and closes the bill from a dedicated screen — typically on a different PC at a central cash counter.
+
+This mirrors how many pharmacies and high-traffic retail counters operate: sales staff ring up items at the terminal, while a single cashier handles all cash collection.
+
+---
+
+## How It Works
+
+1. A POS Profile is configured with **Cashier Settlement** enabled.
+2. At the terminal, the operator builds the cart as usual. The checkout button reads **Send to Cashier** instead of **Pay**.
+3. Pressing **Send to Cashier** saves the order as an **unsettled draft invoice** — no payment is collected. The cart clears, ready for the next customer.
+4. The unsettled invoice appears on the **Cashier** screen on any PC signed in to the same POS Profile. The list refreshes automatically.
+5. The cashier selects an invoice, collects payment through the normal payment dialog, and submits it. The settled bill leaves the list, and the genuine tax invoice prints.
+
+Under the hood this reuses the existing draft-invoice workflow. Unsettled bills are drafts (`docstatus = 0`) flagged with a `POS Awaiting Settlement` field, which keeps them separate from ordinary [held orders](07-draft-orders.md). When a bill is settled, the invoice is re-associated with the **cashier's** open shift, so the collected amount is reconciled in the cashier's shift, not the terminal operator's.
+
+---
+
+## Enabling the Feature
+
+Two settings on the **POS Profile** control the terminal behavior:
+
+| Setting | Description |
+|---|---|
+| Enable Cashier Settlement | Turns the terminal's checkout into **Send to Cashier**. No payment is collected at the terminal; the order is saved for a cashier to settle. |
+| Print Backup Receipt | When enabled, the terminal prints a non-genuine **backup receipt** for the customer at the moment the order is sent. The genuine tax invoice is printed later by the cashier after settlement. (Only available when Cashier Settlement is enabled.) |
+
+---
+
+## Cashier Access Control
+
+Not every user is a cashier. Access is controlled per user on the POS Profile's **Applicable for Users** table:
+
+| Field | Description |
+|---|---|
+| Is Cashier | When checked, this user may open the Cashier screen and settle (close) bills. |
+
+Access rules:
+
+- Only users with **Is Cashier** checked can open the Cashier screen or settle a bill.
+- **Administrator** and any user with the **System Manager** role always have access, so managers/admins are never locked out.
+- Enforcement is on the **server**, not just the UI:
+  - The Cashier route redirects non-cashiers back to the POS screen.
+  - The Cashier nav item is hidden for non-cashiers.
+  - The settlement and "list unsettled invoices" APIs reject non-cashiers, so a bill cannot be closed by an unauthorized user even outside the UI.
+
+---
+
+## Terminal Workflow (Sales Operator)
+
+1. Open a shift and build the cart (items, customer, discounts) as normal.
+2. The checkout button shows **Send to Cashier**.
+3. Press it to save the unsettled bill. If **Print Backup Receipt** is enabled, a backup copy prints for the customer.
+4. The cart clears immediately for the next sale.
+
+Returns are unaffected — return mode still uses the normal payment flow even when Cashier Settlement is enabled.
+
+---
+
+## Cashier Workflow (Settlement Screen)
+
+Open the **Cashier** screen from the sidebar, or press `Alt + 0`.
+
+The screen lists every unsettled invoice for the POS Profile — regardless of which terminal or operator created it — and refreshes on its own every few seconds so new bills appear and settled bills disappear without manual reloading.
+
+Each row shows the customer, invoice reference, date/time, item count, and grand total.
+
+### Settling a Bill (Keyboard or Mouse)
+
+| Action | Result |
+|---|---|
+| `↑` / `↓` | Move the highlight up/down the list |
+| `Enter` | Open the payment dialog for the highlighted bill |
+| Mouse click | Open the payment dialog for that bill |
+
+In the payment dialog the cashier collects payment exactly like a normal sale. On **Save & Print**, the invoice is submitted, the genuine tax invoice prints, and the bill drops off the unsettled list.
+
+A manual **Refresh** button is available if needed.
+
+---
+
+## Sales Invoice and POS Invoice Support
+
+Cashier Settlement works whether the system is configured for **Sales Invoice** or **POS Invoice** (set in POS Settings).
+
+ERPNext requires at least one mode of payment on a POS Invoice, even as a draft. Because no payment is collected at the terminal, X POS automatically seeds a zero-amount payment row on the draft so it can be saved; the cashier replaces it with the real amounts at settlement time.
+
+---
+
+## Use Cases
+
+### Pharmacy / Retail Cash Counter
+1. The counter staff scan items and hand the customer a backup receipt.
+2. The customer walks to the cash counter and pays.
+3. The cashier finds the bill on the Cashier screen, collects payment, and prints the official invoice.
+
+### Multiple Terminals, One Cashier
+Several sales terminals can send bills to a single Cashier screen. The cashier works through the queue using the keyboard, clearing each bill as payment is collected.
+
+### Manager-Controlled Closing
+By granting **Is Cashier** only to trusted staff, businesses ensure that bill creation (open to many operators) and money collection (restricted) are handled by different people.
+
+---
+
+## Tips
+
+- The collected amount reconciles in the **cashier's** shift, so make sure the cashier has an open shift before settling.
+- Use **Print Backup Receipt** so customers have something to present at the cash counter; it is clearly a draft/backup, not the tax invoice.
+- The Cashier screen refreshes automatically, but the **Refresh** button forces an immediate reload.
+- Ordinary [held orders](07-draft-orders.md) do **not** appear on the Cashier screen — only bills explicitly sent for settlement.
+- See [POS Profile Configuration](24-pos-profile-config.md) for the related settings and [Keyboard Shortcuts](25-keyboard-shortcuts.md) for the full navigation reference.

From 2d366c81e974c676accd29b1970bb4fce117ae57 Mon Sep 17 00:00:00 2001
From: Ali Raza <soundsofnation29@gmail.com>
Date: Thu, 4 Jun 2026 17:55:37 +0500
Subject: [PATCH 2/5] feat: Add POS Role and Permission management

- Introduced new DocTypes: POSRole and POSRolePermission to manage roles and their associated permissions.
- Implemented permission matrix in POS Role for better user experience.
- Added integration tests for POSPermission and POSRole.
- Updated existing POS Print Format Rule and Purchase Taxes to new file permissions.
- Created POS Shift Reconciliation report for detailed shift analysis.
- Enhanced workspace configuration to include new reports and functionalities.
- Refactored code for better maintainability and performance.
---
 .prettierignore                               |   0
 .prettierrc                                   |   0
 frontend/.yarnrc                              |   0
 frontend/electron/database/dbService.ts       |  78 ++
 frontend/electron/database/schema.sql         |  42 +-
 frontend/src/components/MenuBar.vue           |  19 +-
 frontend/src/components/Navbar.vue            |   3 +-
 frontend/src/components/core/BaseListView.vue |   0
 .../src/components/core/ListFilterBar.vue     |   0
 frontend/src/components/core/ListView.vue     |   0
 .../src/components/core/QueryFilterPanel.vue  |   0
 frontend/src/components/core/SortBy.vue       |   0
 frontend/src/components/core/index.ts         |   0
 .../dialogs/BankDropDetailDialog.vue          |   0
 .../dialogs/CameraBarcodeDialog.vue           |   0
 .../src/components/dialogs/ClosingDialog.vue  |   5 +
 .../components/dialogs/CustomerEditDialog.vue |   0
 .../dialogs/ExpenseDetailDialog.vue           |   0
 .../components/dialogs/ExpenseFormDialog.vue  |   0
 .../dialogs/PurchaseInvoiceDetailDialog.vue   |   0
 .../dialogs/PurchaseOrderDetailDialog.vue     |   0
 .../dialogs/ReceiptPreviewDialog.vue          |   8 +-
 .../dialogs/paymentDialogShortcuts.ts         |   0
 .../src/components/reports/MultiLinkInput.vue |   0
 .../components/reports/ReportDataTable.vue    | 210 -----
 .../components/reports/ReportFilterBar.vue    | 145 +++
 .../src/components/reports/ReportTable.vue    | 140 +++
 .../components/ui/select/SelectComponent.vue  |   0
 frontend/src/components/ui/select/index.ts    |   0
 .../src/composables/useKeyboardShortcuts.ts   |   3 +
 frontend/src/composables/useListView.ts       |   0
 frontend/src/composables/usePrintInvoice.ts   |   8 +-
 frontend/src/router/index.ts                  |   4 +
 frontend/src/router/routes.ts                 |   7 +
 frontend/src/services/doctypeMeta.ts          |   0
 frontend/src/services/offerEngine.ts          |   0
 frontend/src/services/reportPrint.ts          | 145 +++
 frontend/src/services/reports.ts              | 566 +++---------
 frontend/src/services/userRights.ts           |  49 +-
 frontend/src/stores/authStore.ts              |  10 +
 frontend/src/stores/posStore.ts               |   9 +-
 frontend/src/utils/datetime/dayjs.ts          |   0
 frontend/src/utils/datetime/formats.ts        |   0
 frontend/src/utils/datetime/index.ts          |   0
 frontend/src/views/CashierView.vue            |   0
 .../src/views/PurchaseInvoiceListView.vue     |   0
 frontend/src/views/PurchaseInvoiceView.vue    |   0
 frontend/src/views/ReportViewerView.vue       | 860 ++++--------------
 frontend/src/views/ReportsIndexView.vue       |  87 +-
 frontend/src/views/RolePermissionsView.vue    | 255 ++++++
 frontend/tests/paymentDialogShortcuts.spec.ts |   0
 xpos/api/auth.py                              | 411 +++++++--
 xpos/api/print_formats.py                     |  48 +
 xpos/api/reports.py                           | 209 +++++
 xpos/api/shifts.py                            |   8 +-
 xpos/api/tests/test_fbr_integration.py        |   0
 xpos/api/utilities.py                         |  14 +-
 xpos/desktop_icon/x_pos.json                  |   0
 xpos/hooks.py                                 |  11 +-
 xpos/install.py                               | 107 +++
 xpos/patches.txt                              |   3 +-
 ...move_unused_pos_profile_discount_fields.py |   0
 xpos/patches/seed_pos_role_permissions.py     |   9 +
 xpos/startup/boot.py                          |  11 +
 xpos/workspace_sidebar/x_pos.json             |   0
 xpos/x_pos/api/item_processing/barcode.py     |   2 +-
 .../api/test_invoice_delivery_charges.py      |   0
 xpos/x_pos/custom/mode_of_payment.json        |   0
 xpos/x_pos/custom/pos_invoice.json            |   0
 xpos/x_pos/custom/pos_invoice_item.json       |   0
 xpos/x_pos/custom/pos_profile_user.json       | 168 +++-
 .../pos_allowed_expense_account/__init__.py   |   0
 .../pos_allowed_expense_account.json          |   0
 .../pos_allowed_expense_account.py            |   0
 .../pos_allowed_source_account/__init__.py    |   0
 .../pos_allowed_source_account.json           |   0
 .../pos_allowed_source_account.py             |   0
 .../doctype/pos_cash_movement/__init__.py     |   0
 .../pos_cash_movement/pos_cash_movement.js    |   0
 .../pos_cash_movement/pos_cash_movement.json  |   0
 .../pos_cash_movement/pos_cash_movement.py    |   0
 .../test_pos_cash_movement.py                 |   0
 .../doctype/pos_closing_shift/__init__.py     |   0
 .../pos_closing_shift/pos_closing_shift.json  |   0
 .../pos_closing_shift/pos_closing_shift.py    |   0
 .../test_pos_closing_shift.py                 |   0
 .../pos_closing_shift_detail/__init__.py      |   0
 .../pos_closing_shift_detail.json             |   0
 .../pos_closing_shift_detail.py               |   0
 .../pos_closing_shift_taxes/__init__.py       |   0
 .../pos_closing_shift_taxes.json              |   0
 .../pos_closing_shift_taxes.py                |   0
 xpos/x_pos/doctype/pos_coupon/__init__.py     |   0
 xpos/x_pos/doctype/pos_coupon/pos_coupon.js   |   0
 xpos/x_pos/doctype/pos_coupon/pos_coupon.json |   0
 xpos/x_pos/doctype/pos_coupon/pos_coupon.py   |   0
 .../doctype/pos_coupon/test_pos_coupon.py     |   0
 .../doctype/pos_coupon_detail/__init__.py     |   0
 .../pos_coupon_detail/pos_coupon_detail.json  |   0
 .../pos_coupon_detail/pos_coupon_detail.py    |   0
 xpos/x_pos/doctype/pos_offer/__init__.py      |   0
 xpos/x_pos/doctype/pos_offer/pos_offer.js     |   0
 xpos/x_pos/doctype/pos_offer/pos_offer.json   |   0
 xpos/x_pos/doctype/pos_offer/pos_offer.py     |   0
 .../x_pos/doctype/pos_offer/test_pos_offer.py |   0
 .../doctype/pos_offer_detail/__init__.py      |   0
 .../pos_offer_detail/pos_offer_detail.json    |   0
 .../pos_offer_detail/pos_offer_detail.py      |   0
 .../doctype/pos_opening_shift/__init__.py     |   0
 .../pos_opening_shift/pos_opening_shift.js    |   0
 .../pos_opening_shift/pos_opening_shift.json  |   0
 .../pos_opening_shift/pos_opening_shift.py    |   0
 .../test_pos_opening_shift.py                 |   0
 .../pos_opening_shift_detail/__init__.py      |   0
 .../pos_opening_shift_detail.json             |   0
 .../pos_opening_shift_detail.py               |   0
 .../pos_payment_entry_reference/__init__.py   |   0
 .../pos_payment_entry_reference.json          |   0
 .../pos_payment_entry_reference.py            |   0
 xpos/x_pos/doctype/pos_permission/__init__.py |   0
 .../doctype/pos_permission/pos_permission.js  |   8 +
 .../pos_permission/pos_permission.json        |  67 ++
 .../doctype/pos_permission/pos_permission.py  |  27 +
 .../pos_permission/test_pos_permission.py     |  22 +
 .../doctype/pos_print_format_rule/__init__.py |   0
 .../pos_print_format_rule.json                |   0
 .../pos_print_format_rule.py                  |   0
 .../doctype/pos_purchase_taxes/__init__.py    |   0
 .../pos_purchase_taxes.json                   |   0
 .../pos_purchase_taxes/pos_purchase_taxes.py  |   0
 xpos/x_pos/doctype/pos_role/__init__.py       |   0
 xpos/x_pos/doctype/pos_role/pos_role.js       | 139 +++
 xpos/x_pos/doctype/pos_role/pos_role.json     |  74 ++
 xpos/x_pos/doctype/pos_role/pos_role.py       |  51 ++
 xpos/x_pos/doctype/pos_role/test_pos_role.py  |  22 +
 .../doctype/pos_role_permission/__init__.py   |   0
 .../pos_role_permission.json                  |  48 +
 .../pos_role_permission.py                    |  24 +
 .../pos_sales_person_filter/__init__.py       |   0
 .../pos_sales_person_filter.json              |   0
 .../pos_sales_person_filter.py                |   0
 xpos/x_pos/integrations/__init__.py           |   0
 xpos/x_pos/integrations/fbr.py                |   0
 .../pos_shift_reconciliation/__init__.py      |   0
 .../pos_shift_reconciliation.js               |  38 +
 .../pos_shift_reconciliation.json             |  34 +
 .../pos_shift_reconciliation.py               | 140 +++
 .../report/stock_audit_report/__init__.py     |   0
 .../stock_audit_report/stock_audit_report.js  |   0
 .../stock_audit_report.json                   |   0
 .../stock_audit_report/stock_audit_report.py  |   0
 xpos/x_pos/workspace/x_pos/x_pos.json         | 231 ++++-
 152 files changed, 3034 insertions(+), 1545 deletions(-)
 mode change 100644 => 100755 .prettierignore
 mode change 100644 => 100755 .prettierrc
 mode change 100644 => 100755 frontend/.yarnrc
 mode change 100644 => 100755 frontend/src/components/core/BaseListView.vue
 mode change 100644 => 100755 frontend/src/components/core/ListFilterBar.vue
 mode change 100644 => 100755 frontend/src/components/core/ListView.vue
 mode change 100644 => 100755 frontend/src/components/core/QueryFilterPanel.vue
 mode change 100644 => 100755 frontend/src/components/core/SortBy.vue
 mode change 100644 => 100755 frontend/src/components/core/index.ts
 mode change 100644 => 100755 frontend/src/components/dialogs/BankDropDetailDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/CameraBarcodeDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/CustomerEditDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/ExpenseDetailDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/ExpenseFormDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/PurchaseInvoiceDetailDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/PurchaseOrderDetailDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/ReceiptPreviewDialog.vue
 mode change 100644 => 100755 frontend/src/components/dialogs/paymentDialogShortcuts.ts
 mode change 100644 => 100755 frontend/src/components/reports/MultiLinkInput.vue
 delete mode 100644 frontend/src/components/reports/ReportDataTable.vue
 create mode 100755 frontend/src/components/reports/ReportFilterBar.vue
 create mode 100755 frontend/src/components/reports/ReportTable.vue
 mode change 100644 => 100755 frontend/src/components/ui/select/SelectComponent.vue
 mode change 100644 => 100755 frontend/src/components/ui/select/index.ts
 mode change 100644 => 100755 frontend/src/composables/useListView.ts
 mode change 100644 => 100755 frontend/src/composables/usePrintInvoice.ts
 mode change 100644 => 100755 frontend/src/services/doctypeMeta.ts
 mode change 100644 => 100755 frontend/src/services/offerEngine.ts
 create mode 100755 frontend/src/services/reportPrint.ts
 mode change 100644 => 100755 frontend/src/services/reports.ts
 mode change 100644 => 100755 frontend/src/utils/datetime/dayjs.ts
 mode change 100644 => 100755 frontend/src/utils/datetime/formats.ts
 mode change 100644 => 100755 frontend/src/utils/datetime/index.ts
 mode change 100644 => 100755 frontend/src/views/CashierView.vue
 mode change 100644 => 100755 frontend/src/views/PurchaseInvoiceListView.vue
 mode change 100644 => 100755 frontend/src/views/PurchaseInvoiceView.vue
 mode change 100644 => 100755 frontend/src/views/ReportViewerView.vue
 mode change 100644 => 100755 frontend/src/views/ReportsIndexView.vue
 create mode 100755 frontend/src/views/RolePermissionsView.vue
 mode change 100644 => 100755 frontend/tests/paymentDialogShortcuts.spec.ts
 create mode 100755 xpos/api/reports.py
 mode change 100644 => 100755 xpos/api/tests/test_fbr_integration.py
 mode change 100644 => 100755 xpos/desktop_icon/x_pos.json
 create mode 100755 xpos/install.py
 mode change 100644 => 100755 xpos/patches/remove_unused_pos_profile_discount_fields.py
 create mode 100644 xpos/patches/seed_pos_role_permissions.py
 mode change 100644 => 100755 xpos/workspace_sidebar/x_pos.json
 mode change 100644 => 100755 xpos/x_pos/api/test_invoice_delivery_charges.py
 mode change 100644 => 100755 xpos/x_pos/custom/mode_of_payment.json
 mode change 100644 => 100755 xpos/x_pos/custom/pos_invoice.json
 mode change 100644 => 100755 xpos/x_pos/custom/pos_invoice_item.json
 mode change 100644 => 100755 xpos/x_pos/custom/pos_profile_user.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_expense_account/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_source_account/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_cash_movement/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.js
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_cash_movement/test_pos_cash_movement.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift/test_pos_closing_shift.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_detail/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_taxes/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon/pos_coupon.js
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon/pos_coupon.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon/pos_coupon.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon/test_pos_coupon.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon_detail/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer/pos_offer.js
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer/pos_offer.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer/pos_offer.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer/test_pos_offer.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer_detail/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.js
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift/test_pos_opening_shift.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift_detail/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_payment_entry_reference/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.py
 create mode 100755 xpos/x_pos/doctype/pos_permission/__init__.py
 create mode 100755 xpos/x_pos/doctype/pos_permission/pos_permission.js
 create mode 100755 xpos/x_pos/doctype/pos_permission/pos_permission.json
 create mode 100755 xpos/x_pos/doctype/pos_permission/pos_permission.py
 create mode 100755 xpos/x_pos/doctype/pos_permission/test_pos_permission.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_print_format_rule/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_purchase_taxes/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.py
 create mode 100755 xpos/x_pos/doctype/pos_role/__init__.py
 create mode 100755 xpos/x_pos/doctype/pos_role/pos_role.js
 create mode 100755 xpos/x_pos/doctype/pos_role/pos_role.json
 create mode 100755 xpos/x_pos/doctype/pos_role/pos_role.py
 create mode 100755 xpos/x_pos/doctype/pos_role/test_pos_role.py
 create mode 100755 xpos/x_pos/doctype/pos_role_permission/__init__.py
 create mode 100755 xpos/x_pos/doctype/pos_role_permission/pos_role_permission.json
 create mode 100755 xpos/x_pos/doctype/pos_role_permission/pos_role_permission.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_sales_person_filter/__init__.py
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.json
 mode change 100644 => 100755 xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.py
 mode change 100644 => 100755 xpos/x_pos/integrations/__init__.py
 mode change 100644 => 100755 xpos/x_pos/integrations/fbr.py
 create mode 100755 xpos/x_pos/report/pos_shift_reconciliation/__init__.py
 create mode 100755 xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.js
 create mode 100755 xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.json
 create mode 100755 xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.py
 mode change 100644 => 100755 xpos/x_pos/report/stock_audit_report/__init__.py
 mode change 100644 => 100755 xpos/x_pos/report/stock_audit_report/stock_audit_report.js
 mode change 100644 => 100755 xpos/x_pos/report/stock_audit_report/stock_audit_report.json
 mode change 100644 => 100755 xpos/x_pos/report/stock_audit_report/stock_audit_report.py

diff --git a/.prettierignore b/.prettierignore
old mode 100644
new mode 100755
diff --git a/.prettierrc b/.prettierrc
old mode 100644
new mode 100755
diff --git a/frontend/.yarnrc b/frontend/.yarnrc
old mode 100644
new mode 100755
diff --git a/frontend/electron/database/dbService.ts b/frontend/electron/database/dbService.ts
index 12c0488..e9ea46d 100755
--- a/frontend/electron/database/dbService.ts
+++ b/frontend/electron/database/dbService.ts
@@ -245,6 +245,84 @@ async function runMigrations(): Promise<void> {
 			log.warn(`Migration for pos_profiles.${col} failed`, err);
 		}
 	}
+
+	const posUserMigrations: [string, string][] = [
+		["close_bill", "TINYINT(1) DEFAULT 1"],
+		["close_shift", "TINYINT(1) DEFAULT 0"],
+		["allow_reprint_invoice", "TINYINT(1) DEFAULT 0"],
+		["shift_report", "TINYINT(1) DEFAULT 0"],
+		["allow_cancel_invoice", "TINYINT(1) DEFAULT 0"],
+		["unsettled_invoices", "TINYINT(1) DEFAULT 0"],
+		["apply_additional_discount", "TINYINT(1) DEFAULT 0"],
+		["apply_standard_discount", "TINYINT(1) DEFAULT 0"],
+		["show_edit_discount_field", "TINYINT(1) DEFAULT 0"],
+		["edit_tax_template", "TINYINT(1) DEFAULT 0"],
+		["allow_change_price", "TINYINT(1) DEFAULT 0"],
+		["quotation", "TINYINT(1) DEFAULT 0"],
+		["sale_return", "TINYINT(1) DEFAULT 0"],
+		["local_purchase", "TINYINT(1) DEFAULT 0"],
+		["purchase_order", "TINYINT(1) DEFAULT 0"],
+		["purchase_invoice", "TINYINT(1) DEFAULT 0"],
+		["stock_adjustment", "TINYINT(1) DEFAULT 0"],
+		["stock_entry", "TINYINT(1) DEFAULT 0"],
+		["near_expiry_items", "TINYINT(1) DEFAULT 0"],
+		["expense", "TINYINT(1) DEFAULT 0"],
+		["bank_drop", "TINYINT(1) DEFAULT 0"],
+		["list_of_invoices", "TINYINT(1) DEFAULT 1"],
+		["list_of_cancelled_invoices", "TINYINT(1) DEFAULT 0"],
+		["list_of_errors", "TINYINT(1) DEFAULT 0"],
+		["list_of_purchase_invoices", "TINYINT(1) DEFAULT 0"],
+		["list_of_quotations", "TINYINT(1) DEFAULT 0"],
+		["list_of_stock_entries", "TINYINT(1) DEFAULT 0"],
+		["list_of_local_purchases", "TINYINT(1) DEFAULT 0"],
+		["list_of_stock_adjustments", "TINYINT(1) DEFAULT 0"],
+		["list_of_expense", "TINYINT(1) DEFAULT 0"],
+		["list_of_bank_drops", "TINYINT(1) DEFAULT 0"],
+		["invoice_settlement_report", "TINYINT(1) DEFAULT 0"],
+		["sales_report_by_time", "TINYINT(1) DEFAULT 0"],
+		["sales_summary_by_hour", "TINYINT(1) DEFAULT 0"],
+		["current_stock_by_brand", "TINYINT(1) DEFAULT 0"],
+		["stock_register", "TINYINT(1) DEFAULT 0"],
+		["current_stock_report", "TINYINT(1) DEFAULT 0"],
+		["discount_limit", "DECIMAL(18,6) DEFAULT 100"],
+	];
+
+	const posUserColumnExists = async (col: string): Promise<boolean> => {
+		const [existing] = await db.execute<RowDataPacket[]>(
+			"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'pos_users' AND COLUMN_NAME = ?",
+			[col],
+		);
+		return (existing as RowDataPacket[]).length > 0;
+	};
+
+	for (const [col, typedef] of posUserMigrations) {
+		try {
+			if (!(await posUserColumnExists(col))) {
+				await db.execute(`ALTER TABLE \`pos_users\` ADD COLUMN \`${col}\` ${typedef}`);
+				log.info(`Migration: added pos_users.${col}`);
+			}
+		} catch (err) {
+			log.warn(`Migration for pos_users.${col} failed`, err);
+		}
+	}
+
+	const posUserRenames: [string, string][] = [
+		["allow_return", "sale_return"],
+		["allow_expense", "expense"],
+		["allow_bank_drop", "bank_drop"],
+		["show_edit_item_tax_template", "edit_tax_template"],
+	];
+	for (const [oldCol, newCol] of posUserRenames) {
+		try {
+			if (await posUserColumnExists(oldCol)) {
+				await db.execute(`UPDATE \`pos_users\` SET \`${newCol}\` = \`${oldCol}\``);
+				await db.execute(`ALTER TABLE \`pos_users\` DROP COLUMN \`${oldCol}\``);
+				log.info(`Migration: renamed pos_users.${oldCol} -> ${newCol}`);
+			}
+		} catch (err) {
+			log.warn(`Migration for pos_users rename ${oldCol} -> ${newCol} failed`, err);
+		}
+	}
 }
 
 async function executeSchemaFile(filePath: string): Promise<void> {
diff --git a/frontend/electron/database/schema.sql b/frontend/electron/database/schema.sql
index c874ab8..73e1c10 100755
--- a/frontend/electron/database/schema.sql
+++ b/frontend/electron/database/schema.sql
@@ -473,20 +473,44 @@ CREATE TABLE IF NOT EXISTS `pos_users` (
   `company` VARCHAR(255) DEFAULT NULL,
   `theme` VARCHAR(50) DEFAULT 'Default',
   `enabled` TINYINT(1) DEFAULT 1,
+  `discount_limit` DECIMAL(18,6) DEFAULT 100,
   `close_bill` TINYINT(1) DEFAULT 1,
+  `close_shift` TINYINT(1) DEFAULT 0,
   `allow_reprint_invoice` TINYINT(1) DEFAULT 0,
-  `stock_adjustment` TINYINT(1) DEFAULT 0,
-  `quotation` TINYINT(1) DEFAULT 0,
+  `shift_report` TINYINT(1) DEFAULT 0,
+  `allow_cancel_invoice` TINYINT(1) DEFAULT 0,
+  `unsettled_invoices` TINYINT(1) DEFAULT 0,
   `apply_additional_discount` TINYINT(1) DEFAULT 0,
   `apply_standard_discount` TINYINT(1) DEFAULT 0,
-  `allow_change_price` TINYINT(1) DEFAULT 0,
   `show_edit_discount_field` TINYINT(1) DEFAULT 0,
-  `show_edit_item_tax_template` TINYINT(1) DEFAULT 0,
-  `allow_return` TINYINT(1) DEFAULT 0,
-  `allow_cancel_invoice` TINYINT(1) DEFAULT 0,
-  `allow_expense` TINYINT(1) DEFAULT 0,
-  `allow_bank_drop` TINYINT(1) DEFAULT 0,
-  `discount_limit` DECIMAL(18,6) DEFAULT 100,
+  `edit_tax_template` TINYINT(1) DEFAULT 0,
+  `allow_change_price` TINYINT(1) DEFAULT 0,
+  `quotation` TINYINT(1) DEFAULT 0,
+  `sale_return` TINYINT(1) DEFAULT 0,
+  `local_purchase` TINYINT(1) DEFAULT 0,
+  `purchase_order` TINYINT(1) DEFAULT 0,
+  `purchase_invoice` TINYINT(1) DEFAULT 0,
+  `stock_adjustment` TINYINT(1) DEFAULT 0,
+  `stock_entry` TINYINT(1) DEFAULT 0,
+  `near_expiry_items` TINYINT(1) DEFAULT 0,
+  `expense` TINYINT(1) DEFAULT 0,
+  `bank_drop` TINYINT(1) DEFAULT 0,
+  `list_of_invoices` TINYINT(1) DEFAULT 1,
+  `list_of_cancelled_invoices` TINYINT(1) DEFAULT 0,
+  `list_of_errors` TINYINT(1) DEFAULT 0,
+  `list_of_purchase_invoices` TINYINT(1) DEFAULT 0,
+  `list_of_quotations` TINYINT(1) DEFAULT 0,
+  `list_of_stock_entries` TINYINT(1) DEFAULT 0,
+  `list_of_local_purchases` TINYINT(1) DEFAULT 0,
+  `list_of_stock_adjustments` TINYINT(1) DEFAULT 0,
+  `list_of_expense` TINYINT(1) DEFAULT 0,
+  `list_of_bank_drops` TINYINT(1) DEFAULT 0,
+  `invoice_settlement_report` TINYINT(1) DEFAULT 0,
+  `sales_report_by_time` TINYINT(1) DEFAULT 0,
+  `sales_summary_by_hour` TINYINT(1) DEFAULT 0,
+  `current_stock_by_brand` TINYINT(1) DEFAULT 0,
+  `stock_register` TINYINT(1) DEFAULT 0,
+  `current_stock_report` TINYINT(1) DEFAULT 0,
   `modified` DATETIME DEFAULT NULL,
   `synced_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
   UNIQUE INDEX `idx_username` (`username`),
diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index 159b026..674d2f4 100755
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -26,7 +26,8 @@
 					class="absolute top-full start-0 min-w-[220px] bg-[#252526] dark:bg-[#252526] border border-[#454545] shadow-2xl py-1 z-[200]"
 				>
 					<template v-for="item in menu.items" :key="item.id">
-						<div v-if="item.separator" class="h-px bg-[#3c3c3c] mx-0 my-1" />
+						<template v-if="item.hidden?.()" />
+						<div v-else-if="item.separator" class="h-px bg-[#3c3c3c] mx-0 my-1" />
 						<button
 							v-else
 							class="w-full flex items-center justify-between px-4 py-1 text-[13px] transition-colors duration-75 outline-none"
@@ -72,6 +73,7 @@ import { usePaymentStore } from "@/stores/paymentStore";
 import { useCustomerStore } from "@/stores/customerStore";
 import { useAuthStore } from "@/stores/authStore";
 import { isElectron } from "@/services/electronBridge";
+import { hasPermission } from "@/services/userRights";
 import __ from "@/lib/translate";
 import { get_full_url } from "@/utils";
 import AboutDialog from "@/components/dialogs/AboutDialog.vue";
@@ -107,6 +109,7 @@ import {
 	RefreshCw,
 	Info,
 	BarChart3,
+	ShieldCheck,
 } from "lucide-vue-next";
 
 const router = useRouter();
@@ -135,7 +138,9 @@ const activeMenuIdx = computed(() => {
 function getNavigableItems(): MenuItem[] {
 	const idx = activeMenuIdx.value;
 	if (idx < 0) return [];
-	return menus.value[idx].items.filter((item) => !item.separator && !item.disabled?.());
+	return menus.value[idx].items.filter(
+		(item) => !item.separator && !item.hidden?.() && !item.disabled?.(),
+	);
 }
 
 function toggleMenu(label: string, menuIndex: number) {
@@ -322,6 +327,7 @@ interface MenuItem {
 	shortcut?: string;
 	separator?: boolean;
 	disabled?: () => boolean;
+	hidden?: () => boolean;
 	action?: () => void;
 }
 
@@ -369,6 +375,7 @@ const menus = computed<Menu[]>(() => [
 				label: "Print Last Receipt",
 				icon: Printer,
 				shortcut: "Ctrl+P",
+				hidden: () => !hasPermission("allow_reprint_invoice"),
 				disabled: () => !posStore.lastInvoiceName,
 				action: () => {
 					const name = posStore.lastInvoiceName;
@@ -389,6 +396,13 @@ const menus = computed<Menu[]>(() => [
 				shortcut: "Ctrl+,",
 				action: () => router.push("/settings"),
 			},
+			{
+				id: "role-permissions",
+				label: "Role Permissions",
+				icon: ShieldCheck,
+				hidden: () => isElectron() || !authStore.canManagePermissions,
+				action: () => router.push("/role-permissions"),
+			},
 			{ id: "sep-f2", separator: true },
 			{
 				id: "signout",
@@ -556,6 +570,7 @@ const menus = computed<Menu[]>(() => [
 				label: "Close Shift",
 				icon: LogOut,
 				shortcut: "Ctrl+Shift+O",
+				hidden: () => !hasPermission("close_shift"),
 				disabled: () => !posStore.isShiftOpen,
 				action: () => {
 					posStore.showClosingDialog = true;
diff --git a/frontend/src/components/Navbar.vue b/frontend/src/components/Navbar.vue
index ad62117..a37d928 100755
--- a/frontend/src/components/Navbar.vue
+++ b/frontend/src/components/Navbar.vue
@@ -108,7 +108,7 @@
 		</TooltipWrapper>
 
 		<TooltipWrapper
-			v-if="posStore.allowPrintLastInvoice && posStore.lastInvoiceName"
+			v-if="posStore.allowPrintLastInvoice && posStore.lastInvoiceName && hasPermission('allow_reprint_invoice')"
 			:content="__('Print Last Invoice')"
 		>
 			<Button
@@ -241,6 +241,7 @@ import { usePosStore } from "@/stores/posStore";
 import { usePaymentStore } from "@/stores/paymentStore";
 import { useAuthStore } from "@/stores/authStore";
 import { __ } from "@/lib/translate";
+import { hasPermission } from "@/services/userRights";
 import { Button, buttonVariants } from "@/components/ui/button";
 import { TooltipWrapper } from "@/components/ui/tooltip";
 import { Badge } from "@/components/ui/badge";
diff --git a/frontend/src/components/core/BaseListView.vue b/frontend/src/components/core/BaseListView.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/core/ListFilterBar.vue b/frontend/src/components/core/ListFilterBar.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/core/ListView.vue b/frontend/src/components/core/ListView.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/core/QueryFilterPanel.vue b/frontend/src/components/core/QueryFilterPanel.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/core/SortBy.vue b/frontend/src/components/core/SortBy.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/core/index.ts b/frontend/src/components/core/index.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/BankDropDetailDialog.vue b/frontend/src/components/dialogs/BankDropDetailDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/CameraBarcodeDialog.vue b/frontend/src/components/dialogs/CameraBarcodeDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/ClosingDialog.vue b/frontend/src/components/dialogs/ClosingDialog.vue
index 9f3dace..1958fb1 100755
--- a/frontend/src/components/dialogs/ClosingDialog.vue
+++ b/frontend/src/components/dialogs/ClosingDialog.vue
@@ -219,6 +219,7 @@
 import { ref, onMounted } from "vue";
 import { usePosStore } from "@/stores/posStore";
 import { showSuccess, showError } from "@/services/api";
+import { hasPermission } from "@/services/userRights";
 import {
 	Dialog,
 	DialogScrollContent,
@@ -319,6 +320,10 @@ function calculateDifference(index: number) {
 
 async function handleCloseShift() {
 	if (isClosing.value) return;
+	if (!hasPermission("close_shift")) {
+		showError(__("Only a Supervisor can close a shift."));
+		return;
+	}
 	isClosing.value = true;
 
 	try {
diff --git a/frontend/src/components/dialogs/CustomerEditDialog.vue b/frontend/src/components/dialogs/CustomerEditDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/ExpenseDetailDialog.vue b/frontend/src/components/dialogs/ExpenseDetailDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/ExpenseFormDialog.vue b/frontend/src/components/dialogs/ExpenseFormDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/PurchaseInvoiceDetailDialog.vue b/frontend/src/components/dialogs/PurchaseInvoiceDetailDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/PurchaseOrderDetailDialog.vue b/frontend/src/components/dialogs/PurchaseOrderDetailDialog.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/dialogs/ReceiptPreviewDialog.vue b/frontend/src/components/dialogs/ReceiptPreviewDialog.vue
old mode 100644
new mode 100755
index e243a1d..5665968
--- a/frontend/src/components/dialogs/ReceiptPreviewDialog.vue
+++ b/frontend/src/components/dialogs/ReceiptPreviewDialog.vue
@@ -272,7 +272,12 @@
 			</div>
 
 			<DialogFooter class="p-6 pt-4 border-t border-border gap-2 sm:gap-2">
-				<Button variant="outline" size="sm" @click="printInvoice(invoice!.name)">
+				<Button
+					v-if="hasPermission('allow_reprint_invoice')"
+					variant="outline"
+					size="sm"
+					@click="printInvoice(invoice!.name)"
+				>
 					<Printer class="w-4 h-4" />
 					{{ __("Print") }}
 				</Button>
@@ -316,6 +321,7 @@ import {
 	DialogTitle,
 } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
+import { hasPermission } from "@/services/userRights";
 import { DateTimePicker } from "@/components/ui/datetime-picker";
 import { usePosStore } from "@/stores/posStore";
 import { useCartStore } from "@/stores/cartStore";
diff --git a/frontend/src/components/dialogs/paymentDialogShortcuts.ts b/frontend/src/components/dialogs/paymentDialogShortcuts.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/components/reports/MultiLinkInput.vue b/frontend/src/components/reports/MultiLinkInput.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/reports/ReportDataTable.vue b/frontend/src/components/reports/ReportDataTable.vue
deleted file mode 100644
index 0f73182..0000000
--- a/frontend/src/components/reports/ReportDataTable.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<script setup lang="ts">
-import { computed } from "vue";
-import { Copy, ArrowUp, ArrowDown, ChevronsUpDown } from "lucide-vue-next";
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
-import __ from "@/lib/translate";
-import {
-	formatReportCell,
-	getVisibleReportColumns,
-	isReportNumericColumn,
-	isReportTotalRow,
-	type ReportColumn,
-} from "@/services/reports";
-
-export interface ReportSortState {
-	fieldname: string;
-	direction: "asc" | "desc";
-}
-
-const props = withDefaults(
-	defineProps<{
-		columns: ReportColumn[];
-		rows: Record<string, unknown>[];
-		currencySymbol: string;
-		sortState: ReportSortState | null;
-		emptyTitle?: string;
-		emptyDescription?: string;
-	}>(),
-	{
-		emptyTitle: "No rows found",
-		emptyDescription: "Adjust filters or refresh the report.",
-	},
-);
-
-const emit = defineEmits<{
-	(e: "sort-change", fieldname: string): void;
-	(e: "copy-row", row: Record<string, unknown>): void;
-}>();
-
-const visibleColumns = computed(() => getVisibleReportColumns(props.columns));
-
-const mobileColumns = computed(() => visibleColumns.value.slice(0, 4));
-
-function headerSortIndicator(column: ReportColumn): string {
-	if (!props.sortState || props.sortState.fieldname !== column.fieldname) {
-		return "none";
-	}
-	return props.sortState.direction;
-}
-
-function rowKey(row: Record<string, unknown>, index: number): string {
-	return String(row.name ?? row.item_code ?? row.code ?? row.id ?? index);
-}
-
-function rowIsTotal(row: Record<string, unknown>): boolean {
-	return isReportTotalRow(row);
-}
-
-function mobilePrimaryValue(row: Record<string, unknown>): string {
-	const primaryColumn = visibleColumns.value[0];
-	if (!primaryColumn) return "—";
-	return formatReportCell(primaryColumn, row[primaryColumn.fieldname], props.currencySymbol);
-}
-
-function mobileSecondaryValue(row: Record<string, unknown>): string {
-	const secondaryColumn = visibleColumns.value[1];
-	if (!secondaryColumn) return "";
-	return formatReportCell(secondaryColumn, row[secondaryColumn.fieldname], props.currencySymbol);
-}
-</script>
-
-<template>
-	<div class="space-y-4">
-		<div v-if="rows.length === 0" class="flex flex-col items-center justify-center py-12 text-center">
-			<div class="rounded-full bg-muted/60 p-4 mb-4">
-				<Copy class="h-6 w-6 text-muted-foreground" />
-			</div>
-			<p class="text-base font-semibold text-foreground">{{ emptyTitle }}</p>
-			<p class="text-sm text-muted-foreground mt-1 max-w-md">{{ emptyDescription }}</p>
-		</div>
-
-		<div v-else class="space-y-3 md:hidden">
-			<Card
-				v-for="(row, index) in rows"
-				:key="rowKey(row, index)"
-				class="overflow-hidden border-border/80 bg-card/95"
-				:class="{ 'bg-amber-500/5 border-amber-500/20': rowIsTotal(row) }"
-			>
-				<div class="p-4 space-y-3">
-					<div class="flex items-start justify-between gap-3">
-						<div class="min-w-0 flex-1">
-							<p class="font-semibold text-foreground truncate">
-								{{ mobilePrimaryValue(row) }}
-							</p>
-							<p class="text-xs text-muted-foreground truncate">
-								{{ mobileSecondaryValue(row) }}
-							</p>
-						</div>
-						<Button
-							variant="ghost"
-							size="icon-sm"
-							class="shrink-0"
-							@click="emit('copy-row', row)"
-						>
-							<Copy class="h-4 w-4" />
-						</Button>
-					</div>
-
-					<div class="grid grid-cols-2 gap-2">
-						<div
-							v-for="column in mobileColumns"
-							:key="column.fieldname"
-							class="rounded-xl bg-muted/40 px-3 py-2"
-						>
-							<p
-								class="text-[10px] font-semibold uppercase tracking-wide text-muted-foreground"
-							>
-								{{ column.label }}
-							</p>
-							<p class="mt-1 text-xs font-medium text-foreground break-words">
-								{{ formatReportCell(column, row[column.fieldname], props.currencySymbol) }}
-							</p>
-						</div>
-					</div>
-				</div>
-			</Card>
-		</div>
-
-		<div
-			v-if="rows.length > 0"
-			class="hidden md:block rounded-2xl border border-border bg-card overflow-hidden"
-		>
-			<div class="overflow-x-auto">
-				<table class="min-w-full text-sm">
-					<thead class="sticky top-0 z-10 bg-muted/90 backdrop-blur border-b border-border">
-						<tr>
-							<th
-								class="w-14 px-4 py-3 text-start text-xs font-semibold uppercase tracking-wide text-muted-foreground"
-							>
-								#
-							</th>
-							<th
-								v-for="column in visibleColumns"
-								:key="column.fieldname"
-								class="px-4 py-3 text-xs font-semibold uppercase tracking-wide text-muted-foreground"
-								:class="isReportNumericColumn(column) ? 'text-end' : 'text-start'"
-								:style="column.width ? { width: `${column.width}px` } : undefined"
-							>
-								<button
-									type="button"
-									class="inline-flex items-center gap-1.5 text-left transition-colors hover:text-foreground"
-									@click="emit('sort-change', column.fieldname)"
-								>
-									<span>{{ column.label }}</span>
-									<ArrowUp
-										v-if="headerSortIndicator(column) === 'asc'"
-										class="h-3.5 w-3.5 text-primary"
-									/>
-									<ArrowDown
-										v-else-if="headerSortIndicator(column) === 'desc'"
-										class="h-3.5 w-3.5 text-primary"
-									/>
-									<ChevronsUpDown v-else class="h-3.5 w-3.5 text-muted-foreground/60" />
-								</button>
-							</th>
-							<th
-								class="w-14 px-4 py-3 text-center text-xs font-semibold uppercase tracking-wide text-muted-foreground"
-							>
-								{{ __("Copy") }}
-							</th>
-						</tr>
-					</thead>
-
-					<tbody class="divide-y divide-border">
-						<tr
-							v-for="(row, index) in rows"
-							:key="rowKey(row, index)"
-							class="transition-colors hover:bg-muted/50"
-							:class="{ 'bg-amber-500/5': rowIsTotal(row) }"
-						>
-							<td class="px-4 py-3 text-muted-foreground">{{ index + 1 }}</td>
-							<td
-								v-for="column in visibleColumns"
-								:key="`${rowKey(row, index)}-${column.fieldname}`"
-								class="px-4 py-3 align-top"
-								:class="
-									isReportNumericColumn(column) ? 'text-end tabular-nums' : 'text-start'
-								"
-							>
-								<div
-									class="max-w-[340px] break-words"
-									:class="isReportNumericColumn(column) ? 'ms-auto' : ''"
-								>
-									{{
-										formatReportCell(column, row[column.fieldname], props.currencySymbol)
-									}}
-								</div>
-							</td>
-							<td class="px-4 py-3 text-center">
-								<Button variant="ghost" size="icon-sm" @click="emit('copy-row', row)">
-									<Copy class="h-4 w-4" />
-								</Button>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-</template>
diff --git a/frontend/src/components/reports/ReportFilterBar.vue b/frontend/src/components/reports/ReportFilterBar.vue
new file mode 100755
index 0000000..76ca5de
--- /dev/null
+++ b/frontend/src/components/reports/ReportFilterBar.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { AlertTriangle, Filter, RefreshCw } from "lucide-vue-next";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Badge } from "@/components/ui/badge";
+import { Card } from "@/components/ui/card";
+import { Select } from "@/components/ui/select";
+import { Autocomplete } from "@/components/ui/autocomplete";
+import { DateTimePicker } from "@/components/ui/datetime-picker";
+import MultiLinkInput from "@/components/reports/MultiLinkInput.vue";
+import __ from "@/lib/translate";
+import { resolveReportLinkFilters, type ReportFilterDefinition } from "@/services/reports";
+
+const props = defineProps<{
+	filters: ReportFilterDefinition[];
+	values: Record<string, unknown>;
+	loading?: boolean;
+	missingRequired?: string[];
+}>();
+
+const emit = defineEmits<{
+	(e: "set", fieldname: string, value: unknown): void;
+	(e: "apply"): void;
+	(e: "reset"): void;
+}>();
+
+function emptyValueFor(fieldname: string): unknown {
+	const def = props.filters.find((filter) => filter.fieldname === fieldname);
+	return def?.type === "multi-link" ? [] : "";
+}
+
+function setValue(filter: ReportFilterDefinition, value: unknown) {
+	emit("set", filter.fieldname, value);
+	for (const dependent of filter.clears ?? []) {
+		emit("set", dependent, emptyValueFor(dependent));
+	}
+}
+
+function stringValue(fieldname: string): string {
+	const value = props.values[fieldname];
+	if (value === null || value === undefined) return "";
+	if (Array.isArray(value)) return value.map((item) => String(item)).join(", ");
+	return String(value);
+}
+
+function multiValue(fieldname: string): string[] {
+	const value = props.values[fieldname];
+	return Array.isArray(value) ? value.map((item) => String(item)) : [];
+}
+
+function placeholder(filter: ReportFilterDefinition): string {
+	if (filter.placeholder) return filter.placeholder;
+	if (filter.type === "multi-link") return `Search and add ${filter.label.toLowerCase()}...`;
+	if (filter.type === "link") return `Search ${filter.label.toLowerCase()}...`;
+	return filter.label;
+}
+</script>
+
+<template>
+	<Card class="border-border/70 bg-card p-4 sm:p-5">
+		<div class="mb-4 flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
+			<div class="flex items-center gap-2">
+				<Filter class="h-4 w-4 text-muted-foreground" />
+				<h2 class="text-base font-semibold text-foreground">{{ __("Filters") }}</h2>
+			</div>
+			<div class="flex flex-wrap items-center gap-2">
+				<Badge v-if="missingRequired && missingRequired.length > 0" variant="warning" class="gap-1.5">
+					<AlertTriangle class="h-3.5 w-3.5" />
+					{{ missingRequired.length }} {{ __("required") }}
+				</Badge>
+				<Button variant="outline" size="sm" class="h-9" @click="emit('reset')">
+					{{ __("Reset") }}
+				</Button>
+				<Button size="sm" class="h-9" :disabled="loading" @click="emit('apply')">
+					<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': loading }" />
+					{{ __("Run") }}
+				</Button>
+			</div>
+		</div>
+
+		<div v-if="filters.length === 0" class="text-sm text-muted-foreground">
+			{{ __("This report has no filters.") }}
+		</div>
+
+		<div v-else class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+			<div v-for="filter in filters" :key="filter.fieldname" class="space-y-1.5">
+				<label class="flex items-center gap-1.5 text-sm font-medium text-foreground">
+					{{ filter.label }}
+					<span v-if="filter.required" class="text-destructive">*</span>
+				</label>
+
+				<Autocomplete
+					v-if="filter.type === 'link'"
+					:model-value="stringValue(filter.fieldname)"
+					:doctype="filter.doctype || 'DocType'"
+					:filters="resolveReportLinkFilters(filter, values)"
+					:placeholder="placeholder(filter)"
+					:open-on-focus="true"
+					:clearable="true"
+					class="w-full"
+					@update:model-value="(value) => setValue(filter, value)"
+				/>
+
+				<MultiLinkInput
+					v-else-if="filter.type === 'multi-link'"
+					:model-value="multiValue(filter.fieldname)"
+					:doctype="filter.doctype || 'DocType'"
+					:filters="resolveReportLinkFilters(filter, values)"
+					:placeholder="placeholder(filter)"
+					class="w-full"
+					@update:model-value="(value) => setValue(filter, value)"
+				/>
+
+				<DateTimePicker
+					v-else-if="filter.type === 'date'"
+					:model-value="stringValue(filter.fieldname)"
+					mode="date"
+					:show-today="true"
+					:clearable="true"
+					:placeholder="placeholder(filter)"
+					class="w-full"
+					@change="(value) => setValue(filter, value)"
+				/>
+
+				<Select
+					v-else-if="filter.type === 'select'"
+					:model-value="stringValue(filter.fieldname)"
+					:placeholder="placeholder(filter)"
+					:items="filter.options || []"
+					@update:model-value="(value) => setValue(filter, value)"
+				/>
+
+				<Input
+					v-else
+					:model-value="stringValue(filter.fieldname)"
+					:type="filter.type === 'text' ? 'text' : 'number'"
+					:step="filter.type === 'float' ? '0.01' : '1'"
+					:placeholder="placeholder(filter)"
+					class="w-full"
+					@update:model-value="(value) => setValue(filter, value)"
+				/>
+			</div>
+		</div>
+	</Card>
+</template>
diff --git a/frontend/src/components/reports/ReportTable.vue b/frontend/src/components/reports/ReportTable.vue
new file mode 100755
index 0000000..16d6db0
--- /dev/null
+++ b/frontend/src/components/reports/ReportTable.vue
@@ -0,0 +1,140 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { ArrowDown, ArrowUp, ChevronsUpDown, Table2 } from "lucide-vue-next";
+import {
+	formatReportCell,
+	getVisibleReportColumns,
+	isReportNumericColumn,
+	isReportTotalRow,
+	type ReportColumn,
+} from "@/services/reports";
+
+export interface ReportSortState {
+	fieldname: string;
+	direction: "asc" | "desc";
+}
+
+const props = withDefaults(
+	defineProps<{
+		columns: ReportColumn[];
+		rows: Record<string, unknown>[];
+		totals?: Record<string, unknown>[];
+		currencySymbol: string;
+		sortState: ReportSortState | null;
+		emptyTitle?: string;
+		emptyDescription?: string;
+	}>(),
+	{
+		totals: () => [],
+		emptyTitle: "No rows found",
+		emptyDescription: "Adjust filters or refresh the report.",
+	},
+);
+
+const emit = defineEmits<{
+	(e: "sort-change", fieldname: string): void;
+}>();
+
+const visibleColumns = computed(() => getVisibleReportColumns(props.columns));
+
+function sortIndicator(column: ReportColumn): "asc" | "desc" | "none" {
+	if (!props.sortState || props.sortState.fieldname !== column.fieldname) return "none";
+	return props.sortState.direction;
+}
+
+function rowKey(row: Record<string, unknown>, index: number): string {
+	return String(row.name ?? row.item_code ?? row.code ?? row.id ?? index);
+}
+
+function totalCell(row: Record<string, unknown>, column: ReportColumn): string {
+	const value = row[column.fieldname];
+	if (value === null || value === undefined || value === "") return "";
+	return formatReportCell(column, value, props.currencySymbol);
+}
+</script>
+
+<template>
+	<div v-if="rows.length === 0" class="flex flex-col items-center justify-center py-16 text-center">
+		<div class="mb-4 rounded-full bg-muted/60 p-4">
+			<Table2 class="h-6 w-6 text-muted-foreground" />
+		</div>
+		<p class="text-base font-semibold text-foreground">{{ emptyTitle }}</p>
+		<p class="mt-1 max-w-md text-sm text-muted-foreground">{{ emptyDescription }}</p>
+	</div>
+
+	<div v-else class="overflow-x-auto rounded-xl border border-border bg-card">
+		<table class="min-w-full text-sm">
+			<thead class="sticky top-0 z-10 border-b border-border bg-muted/90 backdrop-blur">
+				<tr>
+					<th
+						class="w-12 px-3 py-2.5 text-start text-xs font-semibold uppercase tracking-wide text-muted-foreground"
+					>
+						#
+					</th>
+					<th
+						v-for="column in visibleColumns"
+						:key="column.fieldname"
+						class="px-3 py-2.5 text-xs font-semibold uppercase tracking-wide text-muted-foreground"
+						:class="isReportNumericColumn(column) ? 'text-end' : 'text-start'"
+						:style="column.width ? { width: `${column.width}px` } : undefined"
+					>
+						<button
+							type="button"
+							class="inline-flex items-center gap-1.5 transition-colors hover:text-foreground"
+							@click="emit('sort-change', column.fieldname)"
+						>
+							<span>{{ column.label }}</span>
+							<ArrowUp v-if="sortIndicator(column) === 'asc'" class="h-3.5 w-3.5 text-primary" />
+							<ArrowDown
+								v-else-if="sortIndicator(column) === 'desc'"
+								class="h-3.5 w-3.5 text-primary"
+							/>
+							<ChevronsUpDown v-else class="h-3.5 w-3.5 text-muted-foreground/60" />
+						</button>
+					</th>
+				</tr>
+			</thead>
+
+			<tbody class="divide-y divide-border">
+				<tr
+					v-for="(row, index) in rows"
+					:key="rowKey(row, index)"
+					class="transition-colors hover:bg-muted/50"
+					:class="{ 'bg-amber-500/5 font-medium': isReportTotalRow(row) }"
+				>
+					<td class="px-3 py-2 text-muted-foreground">{{ index + 1 }}</td>
+					<td
+						v-for="column in visibleColumns"
+						:key="`${rowKey(row, index)}-${column.fieldname}`"
+						class="px-3 py-2 align-top"
+						:class="isReportNumericColumn(column) ? 'text-end tabular-nums' : 'text-start'"
+					>
+						<div class="max-w-[340px] break-words" :class="isReportNumericColumn(column) ? 'ms-auto' : ''">
+							{{ formatReportCell(column, row[column.fieldname], currencySymbol) }}
+						</div>
+					</td>
+				</tr>
+			</tbody>
+
+			<tfoot v-if="totals.length > 0" class="sticky bottom-0 z-10">
+				<tr
+					v-for="(total, totalIndex) in totals"
+					:key="`total-${totalIndex}`"
+					class="border-t-2 border-border bg-muted/95 font-semibold backdrop-blur"
+				>
+					<td class="px-3 py-2.5 text-muted-foreground">Σ</td>
+					<td
+						v-for="column in visibleColumns"
+						:key="`total-${totalIndex}-${column.fieldname}`"
+						class="px-3 py-2.5 align-top"
+						:class="isReportNumericColumn(column) ? 'text-end tabular-nums' : 'text-start'"
+					>
+						<div :class="isReportNumericColumn(column) ? 'ms-auto' : ''">
+							{{ totalCell(total, column) }}
+						</div>
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+	</div>
+</template>
diff --git a/frontend/src/components/ui/select/SelectComponent.vue b/frontend/src/components/ui/select/SelectComponent.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/components/ui/select/index.ts b/frontend/src/components/ui/select/index.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/composables/useKeyboardShortcuts.ts b/frontend/src/composables/useKeyboardShortcuts.ts
index 9f139ae..b228143 100755
--- a/frontend/src/composables/useKeyboardShortcuts.ts
+++ b/frontend/src/composables/useKeyboardShortcuts.ts
@@ -6,6 +6,7 @@ import { isOnline } from "@/utils";
 import { showError, showSuccess } from "@/services/api";
 import { useSettingsStore } from "@/stores/settingsStore";
 import { usePosStore } from "@/stores/posStore";
+import { hasPermission } from "@/services/userRights";
 
 export interface Shortcut {
 	id: string;
@@ -267,6 +268,7 @@ export function useKeyboardShortcuts() {
 			description: "Print Last Receipt",
 			category: "POS",
 			action: () => {
+				if (!hasPermission("allow_reprint_invoice")) return;
 				window.dispatchEvent(new CustomEvent("xpos:print-last"));
 			},
 		},
@@ -312,6 +314,7 @@ export function useKeyboardShortcuts() {
 			description: "Close Shift",
 			category: "Shift",
 			action: () => {
+				if (!hasPermission("close_shift")) return;
 				window.dispatchEvent(new CustomEvent("xpos:close-shift"));
 			},
 		},
diff --git a/frontend/src/composables/useListView.ts b/frontend/src/composables/useListView.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/composables/usePrintInvoice.ts b/frontend/src/composables/usePrintInvoice.ts
old mode 100644
new mode 100755
index 2f83db5..8c880e6
--- a/frontend/src/composables/usePrintInvoice.ts
+++ b/frontend/src/composables/usePrintInvoice.ts
@@ -1,5 +1,5 @@
 import { usePosStore } from "@/stores/posStore";
-import { showError } from "@/services/api";
+import { call, showError } from "@/services/api";
 import { __ } from "@/lib/translate";
 
 export interface PrintInvoiceOptions {
@@ -42,6 +42,12 @@ export function usePrintInvoice() {
 					setTimeout(() => {
 						printWindow.print();
 					}, 500);
+					call("xpos.api.print_formats.mark_invoice_printed", {
+						doctype,
+						name: invoiceName,
+					}).catch(() => {
+						/* non-fatal: reprint control is best-effort */
+					});
 				};
 			} else {
 				window.open(printUrl, "_blank");
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 42d8fc5..8bf0f87 100755
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -82,6 +82,10 @@ router.beforeEach(async (to, _from, next) => {
     next({ name: "pos" });
     return;
   }
+  if (to.meta.requiresAdmin === true && (isElectron() || !authStore.canManagePermissions)) {
+    next({ name: "pos" });
+    return;
+  }
 
   if (to.meta.title) {
     document.title = `${to.meta.title} | X POS`;
diff --git a/frontend/src/router/routes.ts b/frontend/src/router/routes.ts
index 95ff910..4da3c29 100755
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -15,6 +15,7 @@ const LoginView = () => import("@/views/LoginView.vue");
 const ResetPasswordView = () => import("@/views/ResetPasswordView.vue");
 const BarcodePrintView = () => import("@/views/BarcodePrintView.vue");
 const SetupWizardView = () => import("@/views/SetupWizardView.vue");
+const RolePermissionsView = () => import("@/views/RolePermissionsView.vue");
 import { RouteRecordRaw } from "vue-router";
 
 const routes: RouteRecordRaw[] = [
@@ -124,6 +125,12 @@ const routes: RouteRecordRaw[] = [
 		component: BankDropView,
 		meta: { title: "Bank Drops", requiresAuth: true },
 	},
+	{
+		path: "/role-permissions",
+		name: "role-permissions",
+		component: RolePermissionsView,
+		meta: { title: "Role Permissions", requiresAuth: true, requiresAdmin: true },
+	},
 ];
 
 export default routes;
diff --git a/frontend/src/services/doctypeMeta.ts b/frontend/src/services/doctypeMeta.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/services/offerEngine.ts b/frontend/src/services/offerEngine.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/services/reportPrint.ts b/frontend/src/services/reportPrint.ts
new file mode 100755
index 0000000..02858a0
--- /dev/null
+++ b/frontend/src/services/reportPrint.ts
@@ -0,0 +1,145 @@
+import type { ReportColumn, ReportFilterDefinition } from "@/services/reports";
+
+export interface ThermalReportOptions {
+	title: string;
+	filters: ReportFilterDefinition[];
+	values: Record<string, unknown>;
+	columns: ReportColumn[];
+	rows: Record<string, unknown>[];
+}
+
+function isNumericColumn(column: ReportColumn): boolean {
+	return ["Float", "Int"].includes(String(column.fieldtype || ""));
+}
+
+function pickItemColumn(columns: ReportColumn[]): ReportColumn | undefined {
+	return (
+		columns.find((column) => column.fieldname === "item_name") ||
+		columns.find((column) => /name/i.test(column.fieldname) || /name/i.test(column.label)) ||
+		columns.find((column) => !isNumericColumn(column)) ||
+		columns[0]
+	);
+}
+
+function pickQtyColumn(columns: ReportColumn[]): ReportColumn | undefined {
+	const numeric = columns.filter(isNumericColumn);
+	return (
+		numeric.find((column) => /qty|quantity/i.test(column.fieldname) || /qty|quantity/i.test(column.label)) ||
+		numeric[0]
+	);
+}
+
+function formatQty(value: unknown): string {
+	const qty = Number(value ?? 0);
+	if (Number.isNaN(qty)) return String(value ?? "0");
+	return qty % 1 === 0 ? String(qty) : qty.toFixed(2);
+}
+
+function buildFilterLines(filters: ReportFilterDefinition[], values: Record<string, unknown>): string {
+	return filters
+		.map((filter) => {
+			const value = values[filter.fieldname];
+			if (!value || (Array.isArray(value) && value.length === 0)) return null;
+			const display = Array.isArray(value) ? value.join(", ") : String(value);
+			return `<div><span class="fl">${filter.label}:</span> <span class="fv">${display}</span></div>`;
+		})
+		.filter(Boolean)
+		.join("");
+}
+
+function itemLine(row: Record<string, unknown>, itemColumn?: ReportColumn, qtyColumn?: ReportColumn): string {
+	const name = String((itemColumn && row[itemColumn.fieldname]) || row.item_name || row.item_code || "—");
+	const qty = qtyColumn ? formatQty(row[qtyColumn.fieldname]) : "";
+	return `<div class="item-row"><span class="item-name">${name}</span><span class="item-qty">${qty}</span></div>`;
+}
+
+function buildBody(columns: ReportColumn[], rows: Record<string, unknown>[]): string {
+	const itemColumn = pickItemColumn(columns);
+	const qtyColumn = pickQtyColumn(columns);
+	const hasWarehouse = rows.some((row) => row.warehouse);
+
+	if (!hasWarehouse) {
+		return rows.map((row) => itemLine(row, itemColumn, qtyColumn)).join("");
+	}
+
+	const warehouseMap = new Map<string, Record<string, unknown>[]>();
+	for (const row of rows) {
+		const warehouse = String(row.warehouse || "—");
+		if (!warehouseMap.has(warehouse)) warehouseMap.set(warehouse, []);
+		warehouseMap.get(warehouse)!.push(row);
+	}
+
+	let body = "";
+	for (const [warehouse, warehouseRows] of warehouseMap) {
+		body += `<div class="wh-header">${warehouse}</div>`;
+		for (const row of warehouseRows) {
+			body += itemLine(row, itemColumn, qtyColumn);
+		}
+		body += `<div class="wh-subtotal">Subtotal: ${warehouseRows.length} item(s)</div>`;
+	}
+	return body;
+}
+
+export function buildThermalHtml(options: ThermalReportOptions): string {
+	const { title, filters, values, columns, rows } = options;
+	const now = new Date().toLocaleString();
+	const filterLines = buildFilterLines(filters, values);
+	const bodyHtml = buildBody(columns, rows);
+	const itemHeader = pickItemColumn(columns)?.label || "Item";
+	const qtyHeader = pickQtyColumn(columns)?.label || "Qty";
+
+	return `<!DOCTYPE html>
+	<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<title>${title}</title>
+		<style>
+			@page { size: 80mm auto; margin: 4mm 3mm; }
+			* { box-sizing: border-box; margin: 0; padding: 0; }
+			body { font-family: Arial, sans-serif; font-size: 9pt; width: 74mm; color: #000; }
+			.center { text-align: center; }
+			.title { font-size: 11pt; font-weight: bold; margin-bottom: 2mm; }
+			.divider { border-top: 1px dashed #000; margin: 2mm 0; }
+			.filters { font-size: 7.5pt; color: #333; margin-bottom: 1mm; }
+			.fl { font-weight: bold; }
+			.fv { font-style: italic; }
+			.wh-header { font-weight: bold; font-size: 8.5pt; margin-top: 2mm; padding-bottom: 0.5mm; border-bottom: 1px solid #000; text-transform: uppercase; }
+			.item-row { display: flex; justify-content: space-between; align-items: baseline; padding: 0.6mm 0; border-bottom: 1px dotted #ccc; gap: 2mm; }
+			.item-name { flex: 1; word-break: break-word; line-height: 1.3; }
+			.item-qty { white-space: nowrap; font-weight: bold; text-align: right; min-width: 10mm; }
+			.wh-subtotal { text-align: right; font-size: 7.5pt; color: #555; margin-top: 0.5mm; margin-bottom: 1mm; }
+			.footer { margin-top: 2mm; text-align: center; font-size: 7.5pt; color: #555; }
+			.total-row { font-weight: bold; margin-top: 1.5mm; padding-top: 1mm; border-top: 2px solid #000; display: flex; justify-content: space-between; }
+		</style>
+	</head>
+	<body>
+		<div class="center title">${title}</div>
+		<div class="center" style="font-size:7.5pt; color:#555;">${now}</div>
+		${filterLines ? `<div class="divider"></div><div class="filters">${filterLines}</div>` : ""}
+		<div class="divider"></div>
+		<div style="display:flex; justify-content:space-between; font-weight:bold; font-size:8pt; padding-bottom:1mm; border-bottom:1px solid #000;">
+			<span>${itemHeader}</span><span>${qtyHeader}</span>
+		</div>
+		${bodyHtml}
+		<div class="divider"></div>
+		<div class="total-row"><span>Total Items</span><span>${rows.length}</span></div>
+		<div class="footer">*** End of Report ***</div>
+	</body>
+	</html>`;
+}
+
+export function printThermalReport(options: ThermalReportOptions): boolean {
+	const html = buildThermalHtml(options);
+	const printWindow = window.open("", "_blank");
+	if (!printWindow) return false;
+
+	printWindow.document.open();
+	printWindow.document.write(html);
+	printWindow.document.close();
+	printWindow.focus();
+	printWindow.onload = () => printWindow.print();
+	setTimeout(() => {
+		if (printWindow && !printWindow.closed) printWindow.print();
+	}, 800);
+	return true;
+}
diff --git a/frontend/src/services/reports.ts b/frontend/src/services/reports.ts
old mode 100644
new mode 100755
index cffc43b..dcf20e7
--- a/frontend/src/services/reports.ts
+++ b/frontend/src/services/reports.ts
@@ -3,7 +3,6 @@ import { __ } from "@/lib/utils";
 import { hasPermission, type PosPermissions } from "@/services/userRights";
 
 export type ReportCategory = "Inventory" | "Sales" | "Purchasing" | "Operations";
-export type ReportTone = "emerald" | "blue" | "amber" | "violet" | "cyan";
 export type ReportFilterType = "link" | "multi-link" | "date" | "integer" | "float" | "select" | "text";
 
 export interface ReportFilterOption {
@@ -21,8 +20,8 @@ export interface ReportFilterDefinition {
 	helpText?: string;
 	defaultValue?: string | number | string[];
 	options?: ReportFilterOption[];
-	linkFilters?: (values: Record<string, unknown>) => Record<string, unknown>;
-	dependsOn?: string[];
+	getQueryFilters?: Record<string, unknown>;
+	clears?: string[];
 }
 
 export interface ReportDefinition {
@@ -31,10 +30,8 @@ export interface ReportDefinition {
 	reportName: string;
 	description: string;
 	category: ReportCategory;
-	tone: ReportTone;
 	permissionKey?: keyof PosPermissions;
 	thermalPrint?: boolean;
-	filters: ReportFilterDefinition[];
 }
 
 export interface ReportColumn {
@@ -95,44 +92,7 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Current Stock Report",
 		description: "Live stock valuation by item, warehouse, supplier, brand, and group.",
 		category: "Inventory",
-		tone: "emerald",
 		permissionKey: "current_stock_report",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				required: true,
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-			{
-				fieldname: "supplier",
-				label: "Supplier",
-				type: "link",
-				doctype: "Supplier",
-			},
-			{
-				fieldname: "brand",
-				label: "Brand",
-				type: "link",
-				doctype: "Brand",
-			},
-			{
-				fieldname: "item_group",
-				label: "Item Group",
-				type: "link",
-				doctype: "Item Group",
-			},
-		],
 	},
 	{
 		slug: "current-stock-by-brand",
@@ -140,17 +100,7 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Current Stock By Brand",
 		description: "Brand-wise stock snapshot with quantities and valuation.",
 		category: "Inventory",
-		tone: "emerald",
 		permissionKey: "current_stock_by_brand",
-		filters: [
-			{
-				fieldname: "brand",
-				label: "Brand",
-				type: "multi-link",
-				doctype: "Brand",
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "current-stock-summary",
@@ -158,25 +108,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Current Stock Summary",
 		description: "Compact warehouse stock overview with totals and stock movement levels.",
 		category: "Inventory",
-		tone: "emerald",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				required: true,
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-		],
 	},
 	{
 		slug: "current-stock-with-levels",
@@ -184,25 +115,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Current Stock With Levels",
 		description: "Stock snapshot grouped with reorder and alert levels.",
 		category: "Inventory",
-		tone: "emerald",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				required: true,
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-		],
 	},
 	{
 		slug: "dead-stock-report",
@@ -210,44 +122,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Dead Stock Report",
 		description: "Stock that has been sitting too long with low value movement.",
 		category: "Inventory",
-		tone: "emerald",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-			{
-				fieldname: "days",
-				label: "Days",
-				type: "integer",
-				defaultValue: 30,
-				required: true,
-			},
-			{
-				fieldname: "min_value",
-				label: "Minimum Value",
-				type: "float",
-				defaultValue: 1000,
-				required: true,
-			},
-			{
-				fieldname: "supplier",
-				label: "Supplier",
-				type: "multi-link",
-				doctype: "Supplier",
-			},
-		],
 	},
 	{
 		slug: "stock-value-by-warehouse",
@@ -255,16 +129,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Stock Value By Warehouse",
 		description: "Warehouse value and quantity summary for quick inventory valuation.",
 		category: "Inventory",
-		tone: "emerald",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "stock-value-summary-by-date",
@@ -272,23 +136,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Stock Value Summary By Date",
 		description: "Snapshot stock balance by posting date for trend review.",
 		category: "Inventory",
-		tone: "emerald",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "from_posting_date",
-				label: "From Posting Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "warehouse-stock-movement",
@@ -296,30 +143,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Warehouse Stock Movement",
 		description: "Movement summary by warehouse and voucher type over time.",
 		category: "Operations",
-		tone: "violet",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				defaultValue: daysAgo(30),
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "branch-item-summary",
@@ -327,39 +150,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Branch Item Summary",
 		description: "Item movement and sales summary for a branch and warehouse window.",
 		category: "Operations",
-		tone: "violet",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				required: true,
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "branch-set-summary",
@@ -367,32 +157,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Branch Set Summary",
 		description: "Set-level summary for branch stock and movement tracking.",
 		category: "Operations",
-		tone: "violet",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "link",
-				doctype: "Warehouse",
-				required: true,
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-			{
-				fieldname: "date",
-				label: "Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "low-qty-sales-report",
@@ -400,37 +164,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Low Qty Sales Report",
 		description: "Items sold in low quantities over a selected period.",
 		category: "Sales",
-		tone: "blue",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				defaultValue: daysAgo(30),
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-			{
-				fieldname: "min_qty",
-				label: "Min Qty",
-				type: "integer",
-				defaultValue: 10,
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "zero-qty-sales-report",
@@ -438,30 +171,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Zero Qty Sales Report",
 		description: "Sales lines where no quantity was fulfilled during the period.",
 		category: "Sales",
-		tone: "blue",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				defaultValue: daysAgo(30),
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-		],
 	},
 	{
 		slug: "slow-fast-moving-items",
@@ -469,36 +178,6 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Slow Fast Moving Items",
 		description: "Movement velocity overview to identify fast and slow sellers.",
 		category: "Sales",
-		tone: "blue",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				defaultValue: daysAgo(30),
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				defaultValue: today(),
-				required: true,
-			},
-			{
-				fieldname: "supplier",
-				label: "Supplier",
-				type: "multi-link",
-				doctype: "Supplier",
-			},
-		],
 	},
 	{
 		slug: "stock-audit-report",
@@ -507,43 +186,7 @@ const reportDefinitions: ReportDefinition[] = [
 		description:
 			"Thermal-printable stock audit by item with available qty. Filter by warehouse, brand, supplier, or item.",
 		category: "Inventory",
-		tone: "emerald",
 		thermalPrint: true,
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "warehouse",
-				label: "Warehouse",
-				type: "multi-link",
-				doctype: "Warehouse",
-				linkFilters: (values) => ({ company: values.company, is_group: 0 }),
-				dependsOn: ["company"],
-			},
-			{
-				fieldname: "brand",
-				label: "Brand",
-				type: "multi-link",
-				doctype: "Brand",
-			},
-			{
-				fieldname: "supplier",
-				label: "Supplier",
-				type: "multi-link",
-				doctype: "Supplier",
-			},
-			{
-				fieldname: "item_group",
-				label: "Item Group",
-				type: "multi-link",
-				doctype: "Item Group",
-			},
-		],
 	},
 	{
 		slug: "purchase-order-report",
@@ -551,69 +194,20 @@ const reportDefinitions: ReportDefinition[] = [
 		reportName: "Purchase Order Report",
 		description: "Purchase order summary with supplier, date range, and type filters.",
 		category: "Purchasing",
-		tone: "amber",
-		filters: [
-			{
-				fieldname: "company",
-				label: "Company",
-				type: "link",
-				doctype: "Company",
-				required: true,
-			},
-			{
-				fieldname: "supplier",
-				label: "Supplier",
-				type: "link",
-				doctype: "Supplier",
-				required: true,
-			},
-			{
-				fieldname: "from_date",
-				label: "From Date",
-				type: "date",
-				required: true,
-			},
-			{
-				fieldname: "to_date",
-				label: "To Date",
-				type: "date",
-				required: true,
-			},
-			{
-				fieldname: "type",
-				label: "Type",
-				type: "select",
-				defaultValue: "All",
-				options: [
-					{ label: "All", value: "All" },
-					{ label: "Based on ReOrder Level", value: "Based on ReOrder Level" },
-					{ label: "Based on Sales", value: "Based on Sales" },
-				],
-				required: true,
-			},
-		],
+	},
+	{
+		slug: "pos-shift-reconciliation",
+		title: "Shift Reconciliation",
+		reportName: "POS Shift Reconciliation",
+		description: "Z-report: items sold with quantities plus totals by payment mode for end-of-shift cash-up.",
+		category: "Sales",
+		permissionKey: "shift_report",
+		thermalPrint: true,
 	},
 ];
 
 const reportMap = new Map(reportDefinitions.map((report) => [report.slug, report]));
 
-function today(): string {
-	const now = new Date();
-	const year = now.getFullYear();
-	const month = String(now.getMonth() + 1).padStart(2, "0");
-	const day = String(now.getDate()).padStart(2, "0");
-	return `${year}-${month}-${day}`;
-}
-
-function daysAgo(days: number): string {
-	const date = new Date();
-	date.setDate(date.getDate() - days);
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	return `${year}-${month}-${day}`;
-}
-
 function cloneValue<T>(value: T): T {
 	if (Array.isArray(value)) return [...value] as T;
 	if (value && typeof value === "object") return { ...(value as Record<string, unknown>) } as T;
@@ -638,35 +232,33 @@ export function isReportAccessible(report: ReportDefinition): boolean {
 }
 
 export function buildInitialReportFilters(
-	report: ReportDefinition,
+	filters: ReportFilterDefinition[],
 	context: ReportContextDefaults = {},
 ): Record<string, unknown> {
-	const filters: Record<string, unknown> = {};
+	const state: Record<string, unknown> = {};
 
-	for (const filter of report.filters) {
-		filters[filter.fieldname] = cloneValue(
-			filter.defaultValue ?? (filter.type === "multi-link" ? [] : ""),
-		);
+	for (const filter of filters) {
+		state[filter.fieldname] = cloneValue(filter.defaultValue ?? (filter.type === "multi-link" ? [] : ""));
 	}
 
-	if (context.company && Object.prototype.hasOwnProperty.call(filters, "company")) {
-		filters.company = context.company;
+	if (context.company && Object.prototype.hasOwnProperty.call(state, "company")) {
+		state.company = context.company;
 	}
 
-	if (context.warehouse && Object.prototype.hasOwnProperty.call(filters, "warehouse")) {
-		filters.warehouse = context.warehouse;
+	if (context.warehouse && Object.prototype.hasOwnProperty.call(state, "warehouse")) {
+		state.warehouse = context.warehouse;
 	}
 
-	return filters;
+	return state;
 }
 
 export function normalizeReportFilters(
-	report: ReportDefinition,
+	filters: ReportFilterDefinition[],
 	values: Record<string, unknown>,
 ): Record<string, unknown> {
 	const payload: Record<string, unknown> = {};
 
-	for (const filter of report.filters) {
+	for (const filter of filters) {
 		const rawValue = values[filter.fieldname];
 
 		if (rawValue === undefined || rawValue === null || rawValue === "") {
@@ -700,12 +292,12 @@ export function normalizeReportFilters(
 }
 
 export function hydrateReportFiltersFromQuery(
-	report: ReportDefinition,
+	filters: ReportFilterDefinition[],
 	query: Record<string, string | string[] | null | undefined>,
 ): Record<string, unknown> {
-	const hydrated = buildInitialReportFilters(report);
+	const hydrated = buildInitialReportFilters(filters);
 
-	for (const filter of report.filters) {
+	for (const filter of filters) {
 		const queryValue = query[filter.fieldname];
 		if (queryValue === undefined || queryValue === null || queryValue === "") {
 			continue;
@@ -742,11 +334,11 @@ export function hydrateReportFiltersFromQuery(
 }
 
 export function serializeReportFiltersToQuery(
-	report: ReportDefinition,
+	filters: ReportFilterDefinition[],
 	values: Record<string, unknown>,
 ): Record<string, string | string[]> {
 	const query: Record<string, string | string[]> = {};
-	const normalized = normalizeReportFilters(report, values);
+	const normalized = normalizeReportFilters(filters, values);
 
 	for (const [fieldname, value] of Object.entries(normalized)) {
 		if (Array.isArray(value)) {
@@ -766,6 +358,22 @@ export function serializeReportFiltersToQuery(
 	return query;
 }
 
+export function resolveReportLinkFilters(
+	filter: ReportFilterDefinition,
+	values: Record<string, unknown>,
+): Record<string, unknown> {
+	if (!filter.getQueryFilters) return {};
+	const resolved: Record<string, unknown> = {};
+	for (const [key, raw] of Object.entries(filter.getQueryFilters)) {
+		if (typeof raw === "string" && raw.startsWith("$")) {
+			resolved[key] = values[raw.slice(1)];
+		} else {
+			resolved[key] = raw;
+		}
+	}
+	return resolved;
+}
+
 export function getVisibleReportColumns(columns: ReportColumn[]): ReportColumn[] {
 	return columns.filter(
 		(column) => !reportUtilityFields.has(column.fieldname) && !String(column.fieldname).startsWith("_"),
@@ -780,6 +388,87 @@ export function isReportTotalRow(row: Record<string, unknown>): boolean {
 	return Boolean(row.is_total_row || row.is_subtotal || row._is_total_row);
 }
 
+export function normalizeReportRows(
+	columns: ReportColumn[],
+	result: unknown[],
+	options: { addTotalRow?: boolean | number; skipTotalRow?: boolean | number } = {},
+): Record<string, unknown>[] {
+	const lastIndex = result.length - 1;
+	const markLastAsTotal = Boolean(options.addTotalRow) && !options.skipTotalRow;
+
+	return result.map((row, index) => {
+		let record: Record<string, unknown>;
+		if (Array.isArray(row)) {
+			record = {};
+			columns.forEach((column, columnIndex) => {
+				record[column.fieldname] = row[columnIndex];
+			});
+		} else {
+			record = (row as Record<string, unknown>) ?? {};
+		}
+
+		if (markLastAsTotal && index === lastIndex) {
+			record._is_total_row = 1;
+		}
+
+		return record;
+	});
+}
+
+export function compareReportRows(
+	left: Record<string, unknown>,
+	right: Record<string, unknown>,
+	column: ReportColumn,
+): number {
+	const leftValue = left[column.fieldname];
+	const rightValue = right[column.fieldname];
+	const fieldtype = String(column.fieldtype || "");
+
+	if (["Currency", "Float", "Int", "Percent", "Check"].includes(fieldtype)) {
+		const leftNumber = Number(leftValue ?? 0);
+		const rightNumber = Number(rightValue ?? 0);
+		if (Number.isNaN(leftNumber) && Number.isNaN(rightNumber)) return 0;
+		if (Number.isNaN(leftNumber)) return 1;
+		if (Number.isNaN(rightNumber)) return -1;
+		return leftNumber - rightNumber;
+	}
+
+	if (["Date", "Datetime"].includes(fieldtype)) {
+		const leftTime = new Date(String(leftValue || "")).getTime();
+		const rightTime = new Date(String(rightValue || "")).getTime();
+		if (Number.isNaN(leftTime) && Number.isNaN(rightTime)) return 0;
+		if (Number.isNaN(leftTime)) return 1;
+		if (Number.isNaN(rightTime)) return -1;
+		return leftTime - rightTime;
+	}
+
+	return String(leftValue ?? "").localeCompare(String(rightValue ?? ""), undefined, {
+		numeric: true,
+		sensitivity: "base",
+	});
+}
+
+function escapeDelimited(value: string, delimiter: string): string {
+	const needsQuotes = value.includes(delimiter) || value.includes("\n") || value.includes('"');
+	const escaped = value.replace(/"/g, '""');
+	return needsQuotes ? `"${escaped}"` : escaped;
+}
+
+export function buildReportDelimitedRows(
+	columns: ReportColumn[],
+	rows: Record<string, unknown>[],
+	currencySymbol: string,
+	delimiter: "," | "\t",
+): string {
+	const header = columns.map((column) => escapeDelimited(column.label, delimiter)).join(delimiter);
+	const body = rows.map((row) =>
+		columns
+			.map((column) => escapeDelimited(formatReportCell(column, row[column.fieldname], currencySymbol), delimiter))
+			.join(delimiter),
+	);
+	return [header, ...body].join("\n");
+}
+
 function formatReportDateTime(value: unknown): string {
 	if (!value) return "—";
 	const date = new Date(String(value));
@@ -843,6 +532,13 @@ export function formatReportCell(column: ReportColumn, value: unknown, currencyS
 	}
 }
 
+export async function fetchReportMeta(reportName: string): Promise<ReportFilterDefinition[]> {
+	const response = await call<{ filters: ReportFilterDefinition[] }>("xpos.api.reports.get_report_meta", {
+		report: reportName,
+	});
+	return Array.isArray(response?.filters) ? response.filters : [];
+}
+
 export async function fetchReportData(
 	reportName: string,
 	filters: Record<string, unknown>,
diff --git a/frontend/src/services/userRights.ts b/frontend/src/services/userRights.ts
index 954dc3d..d877edd 100755
--- a/frontend/src/services/userRights.ts
+++ b/frontend/src/services/userRights.ts
@@ -1,9 +1,12 @@
 import { ref, computed } from "vue";
 import { isElectron } from "./electronBridge";
+import { call } from "./api";
 
 export interface PosPermissions {
   close_bill: boolean;
+  close_shift: boolean;
   allow_reprint_invoice: boolean;
+  shift_report: boolean;
   allow_cancel_invoice: boolean;
   unsettled_invoices: boolean;
   apply_additional_discount: boolean;
@@ -41,7 +44,9 @@ export interface PosPermissions {
 
 const DEFAULT_PERMISSIONS: PosPermissions = {
   close_bill: true,
+  close_shift: false,
   allow_reprint_invoice: false,
+  shift_report: false,
   allow_cancel_invoice: false,
   unsettled_invoices: false,
   apply_additional_discount: false,
@@ -81,12 +86,32 @@ const currentRole = ref<string>("");
 const permissions = ref<PosPermissions>({ ...DEFAULT_PERMISSIONS });
 const isLoaded = ref(false);
 
-export async function loadPermissions(userEmail: string): Promise<void> {
+function mergePermissions(source: unknown): PosPermissions {
+  const merged = { ...DEFAULT_PERMISSIONS };
+  if (source && typeof source === "object") {
+    for (const [key, val] of Object.entries(source as Record<string, unknown>)) {
+      if (key in merged) {
+        (merged as Record<string, boolean>)[key] = Boolean(val);
+      }
+    }
+  }
+  return merged;
+}
+
+export async function loadPermissions(userEmail: string, posProfile?: string): Promise<void> {
   if (!isElectron()) {
-    permissions.value = Object.keys(DEFAULT_PERMISSIONS).reduce((acc, key) => {
-      acc[key] = true;
-      return acc;
-    }, {} as Record<string, boolean>) as unknown as PosPermissions;
+    const boot = (window.xpos?.boot as Record<string, unknown>) ?? {};
+    currentRole.value = (boot.xpos_role as string) || "";
+    try {
+      const res = await call(
+        "xpos.api.auth.get_my_pos_permissions",
+        posProfile ? { pos_profile: posProfile } : {},
+      );
+      permissions.value = mergePermissions(res);
+    } catch (err) {
+      console.error("[UserRights] Failed to load permissions, using boot fallback:", err);
+      permissions.value = mergePermissions(boot.xpos_permissions);
+    }
     isLoaded.value = true;
     return;
   }
@@ -95,19 +120,7 @@ export async function loadPermissions(userEmail: string): Promise<void> {
     const posUser = await window.electronAPI!.db.getPosUser(userEmail);
     if (posUser) {
       currentRole.value = (posUser as Record<string, unknown>).role as string || "";
-      const userPerms = (posUser as Record<string, unknown>).permissions;
-
-      if (userPerms && typeof userPerms === "object") {
-        const merged = { ...DEFAULT_PERMISSIONS };
-        for (const [key, val] of Object.entries(userPerms as Record<string, unknown>)) {
-          if (key in merged) {
-            (merged as Record<string, boolean>)[key] = Boolean(val);
-          }
-        }
-        permissions.value = merged;
-      } else {
-        permissions.value = { ...DEFAULT_PERMISSIONS };
-      }
+      permissions.value = mergePermissions(posUser);
     } else {
       permissions.value = { ...DEFAULT_PERMISSIONS };
     }
diff --git a/frontend/src/stores/authStore.ts b/frontend/src/stores/authStore.ts
index d780afe..fcf6da5 100755
--- a/frontend/src/stores/authStore.ts
+++ b/frontend/src/stores/authStore.ts
@@ -18,6 +18,14 @@ export const useAuthStore = defineStore("auth", () => {
 	const userEmail = computed(() => user.value?.user_email || "");
 	const userFullName = computed(() => user.value?.user_fullname || "");
 	const isGuest = computed(() => !user.value || user.value.user === "Guest");
+	const isSystemManager = computed(() =>
+		Boolean((window.xpos?.boot as Record<string, unknown> | undefined)?.xpos_is_system_manager),
+	);
+	const canManagePermissions = computed(() =>
+		Boolean(
+			(window.xpos?.boot as Record<string, unknown> | undefined)?.xpos_can_manage_permissions,
+		),
+	);
 
 	async function checkAuth(): Promise<boolean> {
 		try {
@@ -239,6 +247,8 @@ export const useAuthStore = defineStore("auth", () => {
 		userEmail,
 		userFullName,
 		isGuest,
+		isSystemManager,
+		canManagePermissions,
 		checkAuth,
 		login,
 		sendResetPasswordEmail,
diff --git a/frontend/src/stores/posStore.ts b/frontend/src/stores/posStore.ts
index f4db54b..c35d21b 100755
--- a/frontend/src/stores/posStore.ts
+++ b/frontend/src/stores/posStore.ts
@@ -1,8 +1,9 @@
 import { defineStore } from "pinia";
-import { ref, computed } from "vue";
+import { ref, computed, watch } from "vue";
 import { call } from "@/services/api";
 import { cachePOSData, getCachedPOSData } from "@/services/dbBridge";
 import { isElectron } from "@/services/electronBridge";
+import { loadPermissions } from "@/services/userRights";
 import {
 	type POSOpeningShift,
 	type POSProfile,
@@ -42,6 +43,12 @@ export const usePosStore = defineStore("pos", () => {
 	const warehouse = computed(() => posProfile.value?.warehouse || "");
 	const currency = computed(() => posProfile.value?.currency);
 
+	watch(profileName, async (name, prev) => {
+		if (isElectron() || !name || name === prev) return;
+		const { useAuthStore } = await import("@/stores/authStore");
+		await loadPermissions(useAuthStore().userName, name);
+	});
+
 	const currencySymbol = computed(() => {
 		if (window.xpos) {
 			const _currency = (xpos as any).boot?.currencies?.find(
diff --git a/frontend/src/utils/datetime/dayjs.ts b/frontend/src/utils/datetime/dayjs.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/utils/datetime/formats.ts b/frontend/src/utils/datetime/formats.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/utils/datetime/index.ts b/frontend/src/utils/datetime/index.ts
old mode 100644
new mode 100755
diff --git a/frontend/src/views/CashierView.vue b/frontend/src/views/CashierView.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/views/PurchaseInvoiceListView.vue b/frontend/src/views/PurchaseInvoiceListView.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/views/PurchaseInvoiceView.vue b/frontend/src/views/PurchaseInvoiceView.vue
old mode 100644
new mode 100755
diff --git a/frontend/src/views/ReportViewerView.vue b/frontend/src/views/ReportViewerView.vue
old mode 100644
new mode 100755
index eaf7a93..9b18973
--- a/frontend/src/views/ReportViewerView.vue
+++ b/frontend/src/views/ReportViewerView.vue
@@ -6,60 +6,57 @@ import {
 	ArrowLeft,
 	ArrowUpDown,
 	BarChart3,
-	CalendarDays,
-	ChevronRight,
 	Copy,
 	Download,
-	Filter,
-	Layers3,
-	Link2,
 	Lock,
 	Printer,
 	RefreshCw,
 	Search,
-	Sparkles,
 } from "lucide-vue-next";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
 import { ScrollArea } from "@/components/ui/scroll-area";
-import { DateTimePicker } from "@/components/ui/datetime-picker";
+import { Select } from "@/components/ui/select";
 import Pagination from "@/components/orders/Pagination.vue";
-import MultiLinkInput from "@/components/reports/MultiLinkInput.vue";
-import ReportDataTable, { type ReportSortState } from "@/components/reports/ReportDataTable.vue";
+import ReportFilterBar from "@/components/reports/ReportFilterBar.vue";
+import ReportTable, { type ReportSortState } from "@/components/reports/ReportTable.vue";
 import __ from "@/lib/translate";
 import { showError, showSuccess } from "@/services/api";
 import { usePosStore } from "@/stores/posStore";
 import { extractErrorMessage, isOnline } from "@/utils";
+import { printThermalReport } from "@/services/reportPrint";
 import {
 	buildInitialReportFilters,
+	buildReportDelimitedRows,
+	compareReportRows,
 	fetchReportData,
+	fetchReportMeta,
 	formatReportCell,
 	getReportDefinition,
 	getVisibleReportColumns,
 	hydrateReportFiltersFromQuery,
 	isReportAccessible,
+	isReportTotalRow,
 	normalizeReportFilters,
+	normalizeReportRows,
 	serializeReportFiltersToQuery,
 	type ReportColumn,
-	type ReportDefinition,
+	type ReportFilterDefinition,
 	type ReportSummaryItem,
-	type ReportTone,
 } from "@/services/reports";
-import { Select } from "@/components/ui/select";
-import { Autocomplete } from "@/components/ui/autocomplete";
 
 const route = useRoute();
 const router = useRouter();
 const posStore = usePosStore();
 
-const activeReport = computed<ReportDefinition | undefined>(() =>
-	getReportDefinition(route.params.reportSlug),
-);
+const activeReport = computed(() => getReportDefinition(route.params.reportSlug));
 const isReportVisible = computed(() => Boolean(activeReport.value));
 const isReportAllowed = computed(() => (activeReport.value ? isReportAccessible(activeReport.value) : false));
 
+const filters = ref<ReportFilterDefinition[]>([]);
+const filterState = reactive<Record<string, unknown>>({});
 const reportColumns = ref<ReportColumn[]>([]);
 const reportRows = ref<Record<string, unknown>[]>([]);
 const reportSummary = ref<ReportSummaryItem[]>([]);
@@ -70,40 +67,6 @@ const searchTerm = ref("");
 const sortState = ref<ReportSortState | null>(null);
 const currentPage = ref(1);
 const pageSize = ref(20);
-const filterState = reactive<Record<string, unknown>>({});
-
-const toneClasses: Record<ReportTone, { accent: string; chip: string; icon: string; panel: string }> = {
-	emerald: {
-		accent: "from-emerald-500/20 via-emerald-500/10 to-transparent",
-		chip: "bg-emerald-500/10 text-emerald-700 dark:text-emerald-300 border-emerald-500/20",
-		icon: "text-emerald-500",
-		panel: "border-emerald-500/20 bg-emerald-500/5",
-	},
-	blue: {
-		accent: "from-sky-500/20 via-sky-500/10 to-transparent",
-		chip: "bg-sky-500/10 text-sky-700 dark:text-sky-300 border-sky-500/20",
-		icon: "text-sky-500",
-		panel: "border-sky-500/20 bg-sky-500/5",
-	},
-	amber: {
-		accent: "from-amber-500/20 via-amber-500/10 to-transparent",
-		chip: "bg-amber-500/10 text-amber-700 dark:text-amber-300 border-amber-500/20",
-		icon: "text-amber-500",
-		panel: "border-amber-500/20 bg-amber-500/5",
-	},
-	violet: {
-		accent: "from-violet-500/20 via-violet-500/10 to-transparent",
-		chip: "bg-violet-500/10 text-violet-700 dark:text-violet-300 border-violet-500/20",
-		icon: "text-violet-500",
-		panel: "border-violet-500/20 bg-violet-500/5",
-	},
-	cyan: {
-		accent: "from-cyan-500/20 via-cyan-500/10 to-transparent",
-		chip: "bg-cyan-500/10 text-cyan-700 dark:text-cyan-300 border-cyan-500/20",
-		icon: "text-cyan-500",
-		panel: "border-cyan-500/20 bg-cyan-500/5",
-	},
-};
 
 const contextDefaults = computed(() => ({
 	company: posStore.companyName || "",
@@ -112,46 +75,26 @@ const contextDefaults = computed(() => ({
 
 const visibleColumns = computed(() => getVisibleReportColumns(reportColumns.value));
 const summaryItems = computed(() => reportSummary.value || []);
-const activeTone = computed<ReportTone>(() => activeReport.value?.tone ?? "emerald");
+const dataRows = computed(() => reportRows.value.filter((row) => !isReportTotalRow(row)));
+const totalRowsList = computed(() => reportRows.value.filter((row) => isReportTotalRow(row)));
 const isInitialLoading = computed(() => isLoading.value && reportRows.value.length === 0);
-const totalRows = computed(() => filteredRows.value.length);
-const pagedRows = computed(() => {
-	const start = (currentPage.value - 1) * pageSize.value;
-	return filteredRows.value.slice(start, start + pageSize.value);
-});
-const missingRequiredFilters = computed(() => {
-	if (!activeReport.value) return [] as string[];
-	return activeReport.value.filters
-		.filter((filter) => filter.required)
-		.filter((filter) => !isValidFilterValue(filterState[filter.fieldname]))
-		.map((filter) => filter.label);
-});
 const sortFieldOptions = computed(() =>
 	visibleColumns.value.map((column) => ({ label: column.label, value: column.fieldname })),
 );
 
-const dependentFieldMap = computed(() => {
-	const map = new Map<string, string[]>();
-	if (!activeReport.value) return map;
-
-	for (const field of activeReport.value.filters) {
-		for (const dependency of field.dependsOn || []) {
-			const existing = map.get(dependency) || [];
-			map.set(dependency, [...existing, field.fieldname]);
-		}
-	}
-
-	return map;
-});
+const missingRequiredFilters = computed(() =>
+	filters.value
+		.filter((filter) => filter.required && !isValidFilterValue(filterState[filter.fieldname]))
+		.map((filter) => filter.label),
+);
 
 const filteredRows = computed(() => {
 	const query = searchTerm.value.trim().toLowerCase();
-	const rows = reportRows.value.filter((row) => {
+	const rows = dataRows.value.filter((row) => {
 		if (!query) return true;
-		return visibleColumns.value.some((column) => {
-			const value = formatReportCell(column, row[column.fieldname], posStore.currencySymbol);
-			return value.toLowerCase().includes(query);
-		});
+		return visibleColumns.value.some((column) =>
+			formatReportCell(column, row[column.fieldname], posStore.currencySymbol).toLowerCase().includes(query),
+		);
 	});
 
 	if (!sortState.value) return rows;
@@ -161,35 +104,34 @@ const filteredRows = computed(() => {
 	return [...rows]
 		.map((row, index) => ({ row, index }))
 		.sort((left, right) => {
-			const comparison = compareRows(left.row, right.row, column);
-			if (comparison !== 0) {
-				return sortState.value?.direction === "desc" ? -comparison : comparison;
-			}
+			const comparison = compareReportRows(left.row, right.row, column);
+			if (comparison !== 0) return sortState.value?.direction === "desc" ? -comparison : comparison;
 			return left.index - right.index;
 		})
 		.map((entry) => entry.row);
 });
 
+const totalRows = computed(() => filteredRows.value.length);
+const pagedRows = computed(() => {
+	const start = (currentPage.value - 1) * pageSize.value;
+	return filteredRows.value.slice(start, start + pageSize.value);
+});
+
 watch(
 	() => route.params.reportSlug,
-	async () => {
-		await loadReport();
+	() => {
+		void loadReport();
 	},
 	{ immediate: true },
 );
 
-watch(searchTerm, () => {
-	currentPage.value = 1;
-});
-
-watch(sortState, () => {
+watch([searchTerm, sortState], () => {
 	currentPage.value = 1;
 });
 
-function resetReportState() {
-	for (const key of Object.keys(filterState)) {
-		delete filterState[key];
-	}
+function resetState() {
+	for (const key of Object.keys(filterState)) delete filterState[key];
+	filters.value = [];
 	reportColumns.value = [];
 	reportRows.value = [];
 	reportSummary.value = [];
@@ -202,80 +144,40 @@ function resetReportState() {
 
 async function loadReport() {
 	const report = activeReport.value;
-	resetReportState();
+	resetState();
 
 	if (!report) {
-		errorMessage.value = __("Report not found.");
 		document.title = `${__("Reports")} | X POS`;
 		return;
 	}
 
+	document.title = `${report.title} | X POS`;
 	if (!isReportAccessible(report)) {
 		errorMessage.value = __("You do not have access to this report.");
-		document.title = `${report.title} | X POS`;
 		return;
 	}
 
-	Object.assign(filterState, buildInitialReportFilters(report, contextDefaults.value));
+	try {
+		filters.value = await fetchReportMeta(report.reportName);
+	} catch (error) {
+		errorMessage.value = extractErrorMessage(error);
+		showError(errorMessage.value);
+		return;
+	}
+
+	Object.assign(filterState, buildInitialReportFilters(filters.value, contextDefaults.value));
 	Object.assign(
 		filterState,
 		hydrateReportFiltersFromQuery(
-			report,
+			filters.value,
 			route.query as Record<string, string | string[] | null | undefined>,
 		),
 	);
-	document.title = `${report.title} | X POS`;
 	await runReport();
 }
 
 function setFilterValue(fieldname: string, value: unknown) {
 	filterState[fieldname] = value;
-
-	const dependents = dependentFieldMap.value.get(fieldname) || [];
-	for (const dependentField of dependents) {
-		const dependentDefinition = activeReport.value?.filters.find(
-			(item) => item.fieldname === dependentField,
-		);
-		if (!dependentDefinition) continue;
-		filterState[dependentField] = dependentDefinition.type === "multi-link" ? [] : "";
-	}
-}
-
-function getStringFilterValue(fieldname: string): string {
-	const value = filterState[fieldname];
-	if (value === null || value === undefined) return "";
-	if (Array.isArray(value)) return value.map((item) => String(item)).join(", ");
-	return String(value);
-}
-
-function getMultiFilterValue(fieldname: string): string[] {
-	const value = filterState[fieldname];
-	if (!Array.isArray(value)) return [];
-	return value.map((item) => String(item));
-}
-
-function getSelectFilterValue(fieldname: string): string {
-	return getStringFilterValue(fieldname);
-}
-
-function getLinkFilters(filter: NonNullable<ReportDefinition["filters"]>[number]): Record<string, unknown> {
-	return filter.linkFilters ? filter.linkFilters(filterState) : {};
-}
-
-function getFilterPlaceholder(filter: NonNullable<ReportDefinition["filters"]>[number]): string {
-	if (filter.placeholder) return filter.placeholder;
-	if (filter.type === "multi-link") return `Search and add ${filter.label.toLowerCase()}...`;
-	if (filter.type === "link") return `Search ${filter.label.toLowerCase()}...`;
-	return filter.label;
-}
-
-function formatSummaryValue(value: unknown): string {
-	if (value === null || value === undefined || value === "") return "—";
-	if (Array.isArray(value)) return value.map((item) => String(item)).join(", ");
-	if (typeof value === "number") {
-		return value.toLocaleString(undefined, { maximumFractionDigits: 2 });
-	}
-	return String(value);
 }
 
 function isValidFilterValue(value: unknown): boolean {
@@ -301,13 +203,8 @@ async function runReport() {
 		return;
 	}
 
-	const missingFilters = report.filters
-		.filter((filter) => filter.required)
-		.filter((filter) => !isValidFilterValue(filterState[filter.fieldname]))
-		.map((filter) => filter.label);
-
-	if (missingFilters.length > 0) {
-		errorMessage.value = __("Please fill the required filters: {0}", [missingFilters.join(", ")]);
+	if (missingRequiredFilters.value.length > 0) {
+		errorMessage.value = __("Please fill the required filters: {0}", [missingRequiredFilters.value.join(", ")]);
 		showError(errorMessage.value);
 		return;
 	}
@@ -316,17 +213,18 @@ async function runReport() {
 	errorMessage.value = "";
 
 	try {
-		const payload = normalizeReportFilters(report, filterState);
+		const payload = normalizeReportFilters(filters.value, filterState);
 		const response = await fetchReportData(report.reportName, payload);
 		reportColumns.value = response.columns || [];
-		reportRows.value = Array.isArray(response.result) ? response.result : [];
+		reportRows.value = normalizeReportRows(reportColumns.value, Array.isArray(response.result) ? response.result : [], {
+			addTotalRow: response.add_total_row,
+			skipTotalRow: response.skip_total_row,
+		});
 		reportSummary.value = Array.isArray(response.report_summary) ? response.report_summary : [];
 		lastRefreshedAt.value = new Date().toLocaleString();
 		currentPage.value = 1;
-		await router.replace({ path: route.path, query: serializeReportFiltersToQuery(report, filterState) });
-		if (response.message) {
-			showSuccess(response.message);
-		}
+		await router.replace({ path: route.path, query: serializeReportFiltersToQuery(filters.value, filterState) });
+		if (response.message) showSuccess(response.message);
 	} catch (error) {
 		errorMessage.value = extractErrorMessage(error);
 		showError(errorMessage.value);
@@ -335,37 +233,12 @@ async function runReport() {
 	}
 }
 
-function compareRows(
-	left: Record<string, unknown>,
-	right: Record<string, unknown>,
-	column: ReportColumn,
-): number {
-	const leftValue = left[column.fieldname];
-	const rightValue = right[column.fieldname];
-	const fieldtype = String(column.fieldtype || "");
-
-	if (["Currency", "Float", "Int", "Percent", "Check"].includes(fieldtype)) {
-		const leftNumber = Number(leftValue ?? 0);
-		const rightNumber = Number(rightValue ?? 0);
-		if (Number.isNaN(leftNumber) && Number.isNaN(rightNumber)) return 0;
-		if (Number.isNaN(leftNumber)) return 1;
-		if (Number.isNaN(rightNumber)) return -1;
-		return leftNumber - rightNumber;
-	}
-
-	if (["Date", "Datetime"].includes(fieldtype)) {
-		const leftTime = new Date(String(leftValue || "")).getTime();
-		const rightTime = new Date(String(rightValue || "")).getTime();
-		if (Number.isNaN(leftTime) && Number.isNaN(rightTime)) return 0;
-		if (Number.isNaN(leftTime)) return 1;
-		if (Number.isNaN(rightTime)) return -1;
-		return leftTime - rightTime;
-	}
-
-	return String(leftValue ?? "").localeCompare(String(rightValue ?? ""), undefined, {
-		numeric: true,
-		sensitivity: "base",
-	});
+function resetFilters() {
+	Object.assign(filterState, buildInitialReportFilters(filters.value, contextDefaults.value));
+	searchTerm.value = "";
+	sortState.value = null;
+	currentPage.value = 1;
+	void runReport();
 }
 
 function toggleSort(fieldname: string) {
@@ -373,12 +246,10 @@ function toggleSort(fieldname: string) {
 		sortState.value = { fieldname, direction: "asc" };
 		return;
 	}
-
 	if (sortState.value.direction === "asc") {
 		sortState.value = { fieldname, direction: "desc" };
 		return;
 	}
-
 	sortState.value = null;
 }
 
@@ -387,7 +258,6 @@ function setSortField(fieldname: string | undefined) {
 		sortState.value = null;
 		return;
 	}
-
 	if (!sortState.value || sortState.value.fieldname !== fieldname) {
 		sortState.value = { fieldname, direction: "asc" };
 	}
@@ -401,16 +271,11 @@ function toggleSortDirection() {
 	};
 }
 
-function clearSort() {
-	sortState.value = null;
-}
-
 async function copyText(text: string) {
 	if (navigator.clipboard?.writeText) {
 		await navigator.clipboard.writeText(text);
 		return;
 	}
-
 	const textarea = document.createElement("textarea");
 	textarea.value = text;
 	document.body.appendChild(textarea);
@@ -419,72 +284,30 @@ async function copyText(text: string) {
 	document.body.removeChild(textarea);
 }
 
-function escapeDelimited(value: string, delimiter: string): string {
-	const needsQuotes = value.includes(delimiter) || value.includes("\n") || value.includes('"');
-	const escaped = value.replace(/"/g, '""');
-	return needsQuotes ? `"${escaped}"` : escaped;
-}
-
-function buildDelimitedRows(rows: Record<string, unknown>[], delimiter: "," | "\t"): string {
-	const header = visibleColumns.value
-		.map((column) => escapeDelimited(column.label, delimiter))
-		.join(delimiter);
-	const body = rows.map((row) =>
-		visibleColumns.value
-			.map((column) =>
-				escapeDelimited(
-					formatReportCell(column, row[column.fieldname], posStore.currencySymbol),
-					delimiter,
-				),
-			)
-			.join(delimiter),
-	);
-	return [header, ...body].join("\n");
-}
-
-async function copyReportRows() {
+async function copyReport() {
 	if (filteredRows.value.length === 0) {
 		showError(__("No rows to copy."));
 		return;
 	}
-
-	await copyText(buildDelimitedRows(filteredRows.value, "\t"));
+	const rows = [...filteredRows.value, ...totalRowsList.value];
+	await copyText(buildReportDelimitedRows(visibleColumns.value, rows, posStore.currencySymbol, "\t"));
 	showSuccess(__("Copied {0} rows to clipboard.", [String(filteredRows.value.length)]));
 }
 
-async function copyVisibleRows() {
-	if (pagedRows.value.length === 0) {
-		showError(__("No rows to copy."));
-		return;
-	}
-
-	await copyText(buildDelimitedRows(pagedRows.value, "\t"));
-	showSuccess(__("Copied current page to clipboard."));
-}
-
-async function copyRow(row: Record<string, unknown>) {
-	const text = visibleColumns.value
-		.map(
-			(column) =>
-				`${column.label}: ${formatReportCell(column, row[column.fieldname], posStore.currencySymbol)}`,
-		)
-		.join("\n");
-	await copyText(text);
-	showSuccess(__("Row copied to clipboard."));
-}
-
-async function copyReportLink() {
-	await copyText(window.location.href);
-	showSuccess(__("Report link copied to clipboard."));
+function slugify(value: string): string {
+	return value
+		.toLowerCase()
+		.replace(/[^a-z0-9]+/g, "-")
+		.replace(/^-+|-+$/g, "");
 }
 
-async function exportCsv() {
+function exportCsv() {
 	if (filteredRows.value.length === 0) {
 		showError(__("No rows available to export."));
 		return;
 	}
-
-	const csv = buildDelimitedRows(filteredRows.value, ",");
+	const rows = [...filteredRows.value, ...totalRowsList.value];
+	const csv = buildReportDelimitedRows(visibleColumns.value, rows, posStore.currencySymbol, ",");
 	const blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
 	const downloadUrl = URL.createObjectURL(blob);
 	const anchor = document.createElement("a");
@@ -498,186 +321,36 @@ async function exportCsv() {
 	showSuccess(__("Report exported as CSV."));
 }
 
-function slugify(value: string): string {
-	return value
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, "-")
-		.replace(/^-+|-+$/g, "");
+function printThermal() {
+	if (filteredRows.value.length === 0) {
+		showError(__("No data to print."));
+		return;
+	}
+	const ok = printThermalReport({
+		title: activeReport.value?.title || __("Report"),
+		filters: filters.value,
+		values: filterState,
+		columns: visibleColumns.value,
+		rows: filteredRows.value,
+	});
+	if (!ok) showError(__("Print window blocked. Please allow popups and try again."));
 }
 
-function resetFilters() {
-	if (!activeReport.value) return;
-	Object.assign(filterState, buildInitialReportFilters(activeReport.value, contextDefaults.value));
-	searchTerm.value = "";
-	sortState.value = null;
-	currentPage.value = 1;
-	void runReport();
+function formatSummaryValue(value: unknown): string {
+	if (value === null || value === undefined || value === "") return "—";
+	if (Array.isArray(value)) return value.map((item) => String(item)).join(", ");
+	if (typeof value === "number") return value.toLocaleString(undefined, { maximumFractionDigits: 2 });
+	return String(value);
 }
 
 function goBack() {
 	router.push("/reports");
 }
-
-function getSortLabel(): string {
-	if (!sortState.value) return __("Default order");
-	const column = visibleColumns.value.find((item) => item.fieldname === sortState.value?.fieldname);
-	const direction = sortState.value.direction === "asc" ? __("Ascending") : __("Descending");
-	return `${column?.label || sortState.value.fieldname} • ${direction}`;
-}
-function buildThermalHtml(rows: Record<string, unknown>[]): string {
-	const report = activeReport.value;
-	if (!report) return "";
-
-	const now = new Date().toLocaleString();
-	const totalItems = rows.length;
-
-	const filterLines = report.filters
-		.map((f) => {
-			const val = filterState[f.fieldname];
-			if (!val || (Array.isArray(val) && val.length === 0)) return null;
-			const display = Array.isArray(val) ? val.join(", ") : String(val);
-			return `<div><span class="fl">${f.label}:</span> <span class="fv">${display}</span></div>`;
-		})
-		.filter(Boolean)
-		.join("");
-
-	const warehouseMap = new Map<string, Record<string, unknown>[]>();
-	for (const row of rows) {
-		const wh = String(row.warehouse || "—");
-		if (!warehouseMap.has(wh)) warehouseMap.set(wh, []);
-		warehouseMap.get(wh)!.push(row);
-	}
-
-	let bodyHtml = "";
-	for (const [warehouse, warehouseRows] of warehouseMap) {
-		bodyHtml += `<div class="wh-header">${warehouse}</div>`;
-		for (const row of warehouseRows) {
-			const itemName = String(row.item_name || row.item_code || "—");
-			const qty = Number(row.qty_in_hand ?? 0);
-			const qtyStr = qty % 1 === 0 ? String(qty) : qty.toFixed(2);
-			bodyHtml += `<div class="item-row"><span class="item-name">${itemName}</span><span class="item-qty">${qtyStr}</span></div>`;
-		}
-		bodyHtml += `<div class="wh-subtotal">Subtotal: ${warehouseRows.length} item(s)</div>`;
-	}
-
-	return `<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8" />
-	<title>${report.title}</title>
-	<style>
-		@page { size: 80mm auto; margin: 4mm 3mm; }
-		* { box-sizing: border-box; margin: 0; padding: 0; }
-		body {
-			font-family: Arial, sans-serif;
-			font-size: 9pt;
-			width: 74mm;
-			color: #000;
-		}
-		.center { text-align: center; }
-		.title { font-size: 11pt; font-weight: bold; margin-bottom: 2mm; }
-		.divider { border-top: 1px dashed #000; margin: 2mm 0; }
-		.filters { font-size: 7.5pt; color: #333; margin-bottom: 1mm; }
-		.fl { font-weight: bold; }
-		.fv { font-style: italic; }
-		.wh-header {
-			font-weight: bold;
-			font-size: 8.5pt;
-			margin-top: 2mm;
-			padding-bottom: 0.5mm;
-			border-bottom: 1px solid #000;
-			text-transform: uppercase;
-		}
-		.item-row {
-			display: flex;
-			justify-content: space-between;
-			align-items: baseline;
-			padding: 0.6mm 0;
-			border-bottom: 1px dotted #ccc;
-			gap: 2mm;
-		}
-		.item-name {
-			flex: 1;
-			word-break: break-word;
-			line-height: 1.3;
-		}
-		.item-qty {
-			white-space: nowrap;
-			font-weight: bold;
-			text-align: right;
-			min-width: 10mm;
-		}
-		.wh-subtotal {
-			text-align: right;
-			font-size: 7.5pt;
-			color: #555;
-			margin-top: 0.5mm;
-			margin-bottom: 1mm;
-		}
-		.footer {
-			margin-top: 2mm;
-			text-align: center;
-			font-size: 7.5pt;
-			color: #555;
-		}
-		.total-row {
-			font-weight: bold;
-			margin-top: 1.5mm;
-			padding-top: 1mm;
-			border-top: 2px solid #000;
-			display: flex;
-			justify-content: space-between;
-		}
-	</style>
-</head>
-<body>
-	<div class="center title">${report.title}</div>
-	<div class="center" style="font-size:7.5pt; color:#555;">${now}</div>
-	${filterLines ? `<div class="divider"></div><div class="filters">${filterLines}</div>` : ""}
-	<div class="divider"></div>
-	<div style="display:flex; justify-content:space-between; font-weight:bold; font-size:8pt; padding-bottom:1mm; border-bottom:1px solid #000;">
-		<span>Item Name</span><span>Qty</span>
-	</div>
-	${bodyHtml}
-	<div class="divider"></div>
-	<div class="total-row"><span>Total Items</span><span>${totalItems}</span></div>
-	<div class="footer">*** End of Report ***</div>
-</body>
-</html>`;
-}
-
-function printThermal() {
-	if (filteredRows.value.length === 0) {
-		showError(__("No data to print."));
-		return;
-	}
-	const html = buildThermalHtml(filteredRows.value);
-	const printWindow = window.open("", "_blank", "width=320,height=600");
-	if (!printWindow) {
-		showError(__("Print window blocked. Please allow popups and try again."));
-		return;
-	}
-	printWindow.document.open();
-	printWindow.document.write(html);
-	printWindow.document.close();
-	printWindow.focus();
-	printWindow.onload = () => {
-		printWindow.print();
-	};
-	setTimeout(() => {
-		if (printWindow && !printWindow.closed) {
-			printWindow.print();
-		}
-	}, 800);
-}
 </script>
 
 <template>
 	<div class="flex h-full flex-col overflow-hidden bg-background">
-		<div
-			v-if="!isReportVisible || !activeReport"
-			class="flex h-full items-center justify-center p-6 text-center"
-		>
+		<div v-if="!isReportVisible || !activeReport" class="flex h-full items-center justify-center p-6 text-center">
 			<Card class="w-full max-w-xl border-border/70 bg-card p-8">
 				<div class="mx-auto mb-4 flex h-14 w-14 items-center justify-center rounded-2xl bg-muted">
 					<BarChart3 class="h-7 w-7 text-muted-foreground" />
@@ -706,7 +379,7 @@ function printThermal() {
 				<p class="mt-2 text-sm text-muted-foreground">
 					{{ __("You do not have permission to open this report from the app.") }}
 				</p>
-				<div class="mt-6 flex justify-center gap-2">
+				<div class="mt-6 flex justify-center">
 					<Button variant="outline" @click="goBack">
 						<ArrowLeft class="h-4 w-4" />
 						{{ __("Back to Reports") }}
@@ -717,230 +390,80 @@ function printThermal() {
 
 		<ScrollArea v-else class="flex-1">
 			<div class="space-y-4 p-3 pb-4 sm:p-4">
-				<Card class="relative overflow-hidden border-border/70 bg-card/95">
-					<div
-						:class="[
-							'pointer-events-none absolute inset-0 bg-gradient-to-br',
-							toneClasses[activeTone].accent,
-						]"
-					/>
-					<div class="relative space-y-4 p-5 sm:p-6">
-						<div class="flex flex-col gap-4 xl:flex-row xl:items-end xl:justify-between">
-							<div class="max-w-4xl space-y-3">
-								<div class="flex flex-wrap items-center gap-2">
-									<Badge variant="outline" class="gap-1.5 bg-background/80">
-										<Layers3 class="h-3.5 w-3.5" />
-										{{ activeReport.category }}
-									</Badge>
-									<Badge variant="secondary" class="gap-1.5">
-										<BarChart3 class="h-3.5 w-3.5" />
-										{{ reportRows.length }} {{ __("rows") }}
-									</Badge>
-									<Badge variant="secondary" class="gap-1.5">
-										<Sparkles class="h-3.5 w-3.5" />
-										{{ visibleColumns.length }} {{ __("columns") }}
-									</Badge>
-									<Badge v-if="lastRefreshedAt" variant="outline" class="gap-1.5">
-										<CalendarDays class="h-3.5 w-3.5" />
-										{{ lastRefreshedAt }}
-									</Badge>
-								</div>
-
-								<h1 class="text-2xl font-bold tracking-tight text-foreground sm:text-3xl">
-									{{ activeReport.title }}
-								</h1>
-								<p class="max-w-3xl text-sm leading-6 text-muted-foreground sm:text-base">
-									{{ activeReport.description }}
-								</p>
-							</div>
-
-							<div class="flex flex-wrap items-center gap-2">
-								<Button
-									variant="outline"
-									size="sm"
-									class="h-10"
-									:disabled="isLoading"
-									@click="runReport"
-								>
-									<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': isLoading }" />
-									{{ isLoading ? __("Refreshing") : __("Refresh") }}
-								</Button>
-								<Button variant="outline" size="sm" class="h-10" @click="copyVisibleRows">
-									<Copy class="h-4 w-4" />
-									{{ __("Copy Page") }}
-								</Button>
-								<Button variant="outline" size="sm" class="h-10" @click="copyReportRows">
-									<Copy class="h-4 w-4" />
-									{{ __("Copy Data") }}
-								</Button>
-								<Button variant="outline" size="sm" class="h-10" @click="exportCsv">
-									<Download class="h-4 w-4" />
-									{{ __("Export CSV") }}
-								</Button>
-								<Button
-									v-if="activeReport.thermalPrint"
-									variant="outline"
-									size="sm"
-									class="h-10"
-									:disabled="reportRows.length === 0"
-									@click="printThermal"
-								>
-									<Printer class="h-4 w-4" />
-									{{ __("Print Thermal") }}
-								</Button>
-								<Button variant="ghost" size="sm" class="h-10" @click="copyReportLink">
-									<Link2 class="h-4 w-4" />
-									{{ __("Copy Link") }}
-								</Button>
-							</div>
+				<div class="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+					<div class="min-w-0 space-y-1">
+						<div class="flex flex-wrap items-center gap-2">
+							<Button variant="ghost" size="icon-sm" @click="goBack">
+								<ArrowLeft class="h-4 w-4" />
+							</Button>
+							<h1 class="truncate text-xl font-bold tracking-tight text-foreground sm:text-2xl">
+								{{ activeReport.title }}
+							</h1>
+							<Badge variant="outline">{{ activeReport.category }}</Badge>
 						</div>
+						<p class="text-sm text-muted-foreground">{{ activeReport.description }}</p>
 					</div>
-				</Card>
+
+					<div class="flex flex-wrap items-center gap-2">
+						<Button variant="outline" size="sm" class="h-9" :disabled="isLoading" @click="runReport">
+							<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': isLoading }" />
+							{{ __("Refresh") }}
+						</Button>
+						<Button variant="outline" size="sm" class="h-9" @click="copyReport">
+							<Copy class="h-4 w-4" />
+							{{ __("Copy") }}
+						</Button>
+						<Button variant="outline" size="sm" class="h-9" @click="exportCsv">
+							<Download class="h-4 w-4" />
+							{{ __("Export CSV") }}
+						</Button>
+						<Button
+							v-if="activeReport.thermalPrint"
+							variant="outline"
+							size="sm"
+							class="h-9"
+							:disabled="reportRows.length === 0"
+							@click="printThermal"
+						>
+							<Printer class="h-4 w-4" />
+							{{ __("Print") }}
+						</Button>
+					</div>
+				</div>
+
+				<ReportFilterBar
+					:filters="filters"
+					:values="filterState"
+					:loading="isLoading"
+					:missing-required="missingRequiredFilters"
+					@set="setFilterValue"
+					@apply="runReport"
+					@reset="resetFilters"
+				/>
 
 				<div v-if="summaryItems.length > 0" class="grid gap-3 sm:grid-cols-2 xl:grid-cols-4">
 					<Card
 						v-for="item in summaryItems"
 						:key="item.key || item.label || String(item.value)"
-						class="border-border/70 bg-card/95 p-4"
+						class="border-border/70 bg-card p-4"
 					>
-						<div class="flex items-start justify-between gap-3">
-							<div class="min-w-0 space-y-1">
-								<p class="text-xs uppercase tracking-[0.2em] text-muted-foreground">
-									{{ item.label || __("Summary") }}
-								</p>
-								<p class="break-words text-lg font-semibold text-foreground">
-									{{ formatSummaryValue(item.value) }}
-								</p>
-							</div>
-							<Badge v-if="item.indicator || item.color" variant="secondary" class="shrink-0">
-								{{ item.indicator || item.color }}
-							</Badge>
-						</div>
+						<p class="text-xs uppercase tracking-[0.18em] text-muted-foreground">
+							{{ item.label || __("Summary") }}
+						</p>
+						<p class="mt-1 break-words text-lg font-semibold text-foreground">
+							{{ formatSummaryValue(item.value) }}
+						</p>
 					</Card>
 				</div>
 
-				<Card class="border-border/70 bg-card/95 p-4 sm:p-5">
-					<div class="mb-4 flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
-						<div>
-							<div class="flex items-center gap-2">
-								<Filter class="h-4 w-4 text-muted-foreground" />
-								<h2 class="text-base font-semibold text-foreground">{{ __("Filters") }}</h2>
-							</div>
-							<p class="mt-1 text-sm text-muted-foreground">
-								{{ __("Adjust filters and refresh the report to load live data.") }}
-							</p>
-						</div>
-						<div class="flex flex-wrap items-center gap-2">
-							<Badge v-if="missingRequiredFilters.length > 0" variant="warning" class="gap-1.5">
-								<AlertTriangle class="h-3.5 w-3.5" />
-								{{ missingRequiredFilters.length }} {{ __("required") }}
-							</Badge>
-							<Button variant="outline" size="sm" class="h-9" @click="resetFilters">
-								{{ __("Reset") }}
-							</Button>
-							<Button size="sm" class="h-9" :disabled="isLoading" @click="runReport">
-								<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': isLoading }" />
-								{{ __("Apply Filters") }}
-							</Button>
-						</div>
-					</div>
-
-					<div class="grid gap-4 md:grid-cols-2 xl:grid-cols-3">
-						<div
-							v-for="filter in activeReport.filters"
-							:key="filter.fieldname"
-							class="space-y-2 rounded-2xl border border-border/60 bg-muted/20 p-3"
-						>
-							<div class="flex items-center justify-between gap-2">
-								<div class="flex min-w-0 items-center gap-2">
-									<p class="truncate text-sm font-medium text-foreground">
-										{{ filter.label }}
-									</p>
-									<Badge
-										v-if="filter.required"
-										variant="outline"
-										class="text-[10px] uppercase tracking-wide"
-									>
-										{{ __("Required") }}
-									</Badge>
-								</div>
-								<Badge variant="secondary" class="text-[10px] uppercase tracking-wide">
-									{{ filter.type }}
-								</Badge>
-							</div>
-							<p v-if="filter.helpText" class="text-xs text-muted-foreground">
-								{{ filter.helpText }}
-							</p>
-
-							<Autocomplete
-								v-if="filter.type === 'link'"
-								:model-value="getStringFilterValue(filter.fieldname)"
-								:doctype="filter.doctype || 'DocType'"
-								:filters="getLinkFilters(filter)"
-								:placeholder="getFilterPlaceholder(filter)"
-								:open-on-focus="true"
-								:clearable="true"
-								class="w-full"
-								@update:model-value="(value) => setFilterValue(filter.fieldname, value)"
-							/>
-
-							<MultiLinkInput
-								v-else-if="filter.type === 'multi-link'"
-								:model-value="getMultiFilterValue(filter.fieldname)"
-								:doctype="filter.doctype || 'DocType'"
-								:placeholder="getFilterPlaceholder(filter)"
-								class="w-full"
-								@update:model-value="(value) => setFilterValue(filter.fieldname, value)"
-							/>
-
-							<DateTimePicker
-								v-else-if="filter.type === 'date'"
-								:model-value="getStringFilterValue(filter.fieldname)"
-								mode="date"
-								:show-today="true"
-								:clearable="true"
-								:placeholder="getFilterPlaceholder(filter)"
-								class="w-full"
-								@change="(value) => setFilterValue(filter.fieldname, value)"
-							/>
-
-							<Input
-								v-else-if="
-									filter.type === 'integer' ||
-									filter.type === 'float' ||
-									filter.type === 'text'
-								"
-								:model-value="getStringFilterValue(filter.fieldname)"
-								:type="filter.type === 'text' ? 'text' : 'number'"
-								:step="filter.type === 'float' ? '0.01' : '1'"
-								:placeholder="getFilterPlaceholder(filter)"
-								class="w-full"
-								@update:model-value="(value) => setFilterValue(filter.fieldname, value)"
-							/>
-
-							<Select
-								v-else-if="filter.type === 'select'"
-								:model-value="getSelectFilterValue(filter.fieldname)"
-								:placeholder="getFilterPlaceholder(filter)"
-								:items="filter.options || []"
-								@update:model-value="(value) => setFilterValue(filter.fieldname, value)"
-							/>
-						</div>
-					</div>
-				</Card>
-
-				<Card class="border-border/70 bg-card/95 p-4 sm:p-5">
+				<Card class="border-border/70 bg-card p-4 sm:p-5">
 					<div class="mb-4 flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
 						<div class="flex w-full items-center gap-2 lg:max-w-xl">
 							<div class="relative flex-1">
 								<Search
 									class="pointer-events-none absolute start-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground"
 								/>
-								<Input
-									v-model="searchTerm"
-									:placeholder="__('Search rows...')"
-									class="h-10 ps-9"
-								/>
+								<Input v-model="searchTerm" :placeholder="__('Search rows...')" class="h-10 ps-9" />
 							</div>
 							<Select
 								:items="sortFieldOptions"
@@ -948,87 +471,54 @@ function printThermal() {
 								:model-value="sortState?.fieldname || ''"
 								@update:model-value="setSortField"
 							/>
-							<Button
-								variant="outline"
-								size="icon-sm"
-								:disabled="!sortState"
-								@click="toggleSortDirection"
-							>
+							<Button variant="outline" size="icon-sm" :disabled="!sortState" @click="toggleSortDirection">
 								<ArrowUpDown class="h-4 w-4" />
 							</Button>
 						</div>
-
-						<div class="flex flex-wrap items-center gap-2">
-							<Badge variant="secondary" class="gap-1.5">
-								<ChevronRight class="h-3.5 w-3.5 rotate-90" />
-								{{ getSortLabel() }}
-							</Badge>
-							<Button
-								variant="ghost"
-								size="sm"
-								class="h-9"
-								:disabled="!sortState"
-								@click="clearSort"
-							>
-								{{ __("Clear Sort") }}
-							</Button>
+						<div class="flex items-center gap-2 text-sm text-muted-foreground">
+							<Badge variant="secondary">{{ totalRows }} {{ __("rows") }}</Badge>
+							<span v-if="lastRefreshedAt" class="text-xs">{{ lastRefreshedAt }}</span>
 						</div>
 					</div>
 
-					<div
-						v-if="errorMessage"
-						class="mb-4 rounded-2xl border border-destructive/20 bg-destructive/5 p-4"
-					>
+					<div v-if="errorMessage" class="mb-4 rounded-xl border border-destructive/20 bg-destructive/5 p-4">
 						<div class="flex items-start gap-3">
 							<AlertTriangle class="mt-0.5 h-5 w-5 shrink-0 text-destructive" />
 							<div class="min-w-0 flex-1 space-y-3">
 								<p class="text-sm font-medium text-foreground">{{ errorMessage }}</p>
-								<div class="flex items-center gap-2">
-									<Button size="sm" @click="runReport">
-										<RefreshCw class="h-4 w-4" />
-										{{ __("Try Again") }}
-									</Button>
-									<Button variant="outline" size="sm" @click="copyReportLink">
-										<Copy class="h-4 w-4" />
-										{{ __("Copy Link") }}
-									</Button>
-								</div>
+								<Button size="sm" @click="runReport">
+									<RefreshCw class="h-4 w-4" />
+									{{ __("Try Again") }}
+								</Button>
 							</div>
 						</div>
 					</div>
 
-					<div v-if="isInitialLoading" class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
-						<div v-for="i in 6" :key="i" class="skeleton h-28 w-full rounded-2xl"></div>
+					<div v-if="isInitialLoading" class="space-y-2">
+						<div v-for="i in 6" :key="i" class="skeleton h-10 w-full rounded-lg"></div>
 					</div>
 
 					<div v-else>
-						<ReportDataTable
+						<ReportTable
 							:columns="visibleColumns"
 							:rows="pagedRows"
+							:totals="totalRowsList"
 							:currency-symbol="posStore.currencySymbol"
 							:sort-state="sortState"
 							:empty-title="__('No rows found')"
 							:empty-description="__('Try adjusting the filters, search term, or sort order.')"
 							@sort-change="toggleSort"
-							@copy-row="copyRow"
 						/>
 
-						<div class="mt-4 flex flex-col gap-3">
-							<Pagination
-								v-if="totalRows > 0"
-								:total="totalRows"
-								:page-size="pageSize"
-								:current-page="currentPage"
-								@update:current-page="currentPage = $event"
-								@update:page-size="pageSize = $event"
-							/>
-							<div
-								v-else
-								class="rounded-xl border border-dashed border-border/70 bg-muted/20 p-4 text-center text-sm text-muted-foreground"
-							>
-								{{ __("No rows available after filtering.") }}
-							</div>
-						</div>
+						<Pagination
+							v-if="totalRows > 0"
+							class="mt-4"
+							:total="totalRows"
+							:page-size="pageSize"
+							:current-page="currentPage"
+							@update:current-page="currentPage = $event"
+							@update:page-size="pageSize = $event"
+						/>
 					</div>
 				</Card>
 			</div>
diff --git a/frontend/src/views/ReportsIndexView.vue b/frontend/src/views/ReportsIndexView.vue
old mode 100644
new mode 100755
index fbf8ea9..de81040
--- a/frontend/src/views/ReportsIndexView.vue
+++ b/frontend/src/views/ReportsIndexView.vue
@@ -11,8 +11,8 @@ import __ from "@/lib/translate";
 import {
 	getReportDefinitions,
 	isReportAccessible,
+	type ReportCategory,
 	type ReportDefinition,
-	type ReportTone,
 } from "@/services/reports";
 
 const router = useRouter();
@@ -26,7 +26,6 @@ const filteredReports = computed(() => {
 
 	return reportDefinitions.value.filter((report) => {
 		const textParts = [report.title, report.reportName, report.description, report.category, report.slug]
-			.concat(report.filters.map((filter) => filter.label))
 			.join(" ")
 			.toLowerCase();
 		return textParts.includes(query);
@@ -45,37 +44,27 @@ const sectionReports = computed(() => {
 	}));
 });
 
-const toneClasses: Record<ReportTone, { accent: string; chip: string; glow: string; icon: string }> = {
-	emerald: {
+const categoryAccent: Record<ReportCategory, { accent: string; chip: string; icon: string }> = {
+	Inventory: {
 		accent: "from-emerald-500/20 via-emerald-500/10 to-transparent",
 		chip: "bg-emerald-500/10 text-emerald-700 dark:text-emerald-300 border-emerald-500/20",
-		glow: "shadow-emerald-500/10",
 		icon: "text-emerald-500",
 	},
-	blue: {
+	Sales: {
 		accent: "from-sky-500/20 via-sky-500/10 to-transparent",
 		chip: "bg-sky-500/10 text-sky-700 dark:text-sky-300 border-sky-500/20",
-		glow: "shadow-sky-500/10",
 		icon: "text-sky-500",
 	},
-	amber: {
+	Purchasing: {
 		accent: "from-amber-500/20 via-amber-500/10 to-transparent",
 		chip: "bg-amber-500/10 text-amber-700 dark:text-amber-300 border-amber-500/20",
-		glow: "shadow-amber-500/10",
 		icon: "text-amber-500",
 	},
-	violet: {
+	Operations: {
 		accent: "from-violet-500/20 via-violet-500/10 to-transparent",
 		chip: "bg-violet-500/10 text-violet-700 dark:text-violet-300 border-violet-500/20",
-		glow: "shadow-violet-500/10",
 		icon: "text-violet-500",
 	},
-	cyan: {
-		accent: "from-cyan-500/20 via-cyan-500/10 to-transparent",
-		chip: "bg-cyan-500/10 text-cyan-700 dark:text-cyan-300 border-cyan-500/20",
-		glow: "shadow-cyan-500/10",
-		icon: "text-cyan-500",
-	},
 };
 
 function openReport(report: ReportDefinition) {
@@ -133,7 +122,7 @@ function clearSearch() {
 								/>
 								<Input
 									v-model="searchTerm"
-									:placeholder="__('Search reports, filters, or categories...')"
+									:placeholder="__('Search reports or categories...')"
 									class="ps-9 h-10 bg-background/95"
 								/>
 							</div>
@@ -168,9 +157,7 @@ function clearSearch() {
 				<section v-for="section in sectionReports" :key="section.category" class="space-y-3">
 					<div class="flex items-center justify-between gap-3">
 						<div>
-							<h2
-								class="text-sm font-semibold uppercase tracking-[0.18em] text-muted-foreground"
-							>
+							<h2 class="text-sm font-semibold uppercase tracking-[0.18em] text-muted-foreground">
 								{{ section.category }}
 							</h2>
 							<p class="text-xs text-muted-foreground mt-1">
@@ -188,18 +175,17 @@ function clearSearch() {
 							v-for="report in section.reports"
 							:key="report.slug"
 							class="group relative overflow-hidden border-border/70 transition-all duration-200 hover:-translate-y-0.5 hover:shadow-lg"
-							:class="toneClasses[report.tone].glow"
 						>
 							<div
 								:class="[
 									'absolute inset-x-0 top-0 h-1 bg-gradient-to-r',
-									toneClasses[report.tone].accent,
+									categoryAccent[report.category].accent,
 								]"
 							/>
 							<div class="p-5 space-y-4">
 								<div class="flex items-start justify-between gap-3">
 									<div class="min-w-0 flex-1 space-y-2">
-										<Badge :class="toneClasses[report.tone].chip" variant="outline">
+										<Badge :class="categoryAccent[report.category].chip" variant="outline">
 											{{ report.category }}
 										</Badge>
 										<h3 class="text-lg font-semibold text-foreground leading-tight">
@@ -211,54 +197,31 @@ function clearSearch() {
 									</div>
 									<div
 										class="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl border bg-background/80"
-										:class="toneClasses[report.tone].icon"
+										:class="categoryAccent[report.category].icon"
 									>
 										<BarChart3 class="h-5 w-5" />
 									</div>
 								</div>
 
-								<div class="flex flex-wrap gap-1.5">
+								<div class="flex items-center justify-end gap-2 pt-1">
 									<Badge
-										v-for="filter in report.filters.slice(0, 4)"
-										:key="`${report.slug}-${filter.fieldname}`"
-										variant="secondary"
-										class="text-[10px] uppercase tracking-wide"
+										v-if="!isReportAccessible(report)"
+										variant="destructive"
+										class="gap-1.5"
 									>
-										{{ filter.label }}
+										<Lock class="h-3 w-3" />
+										{{ __("Locked") }}
 									</Badge>
-									<Badge
-										v-if="report.filters.length > 4"
+									<Button
 										variant="outline"
-										class="text-[10px] uppercase tracking-wide"
+										size="sm"
+										class="gap-1.5"
+										:disabled="!isReportAccessible(report)"
+										@click="openReport(report)"
 									>
-										+{{ report.filters.length - 4 }}
-									</Badge>
-								</div>
-
-								<div class="flex items-center justify-between gap-2 pt-1">
-									<div class="text-xs text-muted-foreground">
-										{{ report.filters.length }} {{ __("filters") }}
-									</div>
-									<div class="flex items-center gap-2">
-										<Badge
-											v-if="!isReportAccessible(report)"
-											variant="destructive"
-											class="gap-1.5"
-										>
-											<Lock class="h-3 w-3" />
-											{{ __("Locked") }}
-										</Badge>
-										<Button
-											variant="outline"
-											size="sm"
-											class="gap-1.5"
-											:disabled="!isReportAccessible(report)"
-											@click="openReport(report)"
-										>
-											{{ __("Open") }}
-											<ArrowRight class="h-4 w-4" />
-										</Button>
-									</div>
+										{{ __("Open") }}
+										<ArrowRight class="h-4 w-4" />
+									</Button>
 								</div>
 							</div>
 						</Card>
diff --git a/frontend/src/views/RolePermissionsView.vue b/frontend/src/views/RolePermissionsView.vue
new file mode 100755
index 0000000..ab9ed8d
--- /dev/null
+++ b/frontend/src/views/RolePermissionsView.vue
@@ -0,0 +1,255 @@
+<template>
+	<div class="h-full min-h-0 flex flex-col bg-background text-foreground">
+		<div class="flex items-center justify-between px-4 py-3 border-b border-border">
+			<div>
+				<h1 class="text-lg font-semibold">{{ __("Role Permissions") }}</h1>
+				<p class="text-xs text-muted-foreground">
+					{{ __("Configure which POS actions each role may perform.") }}
+				</p>
+			</div>
+			<Button size="sm" variant="outline" :disabled="isLoading" @click="load">
+				<RefreshCw class="w-4 h-4 me-1" :class="{ 'animate-spin': isLoading }" />
+				{{ __("Refresh") }}
+			</Button>
+		</div>
+
+		<div v-if="error" class="m-4 p-3 rounded border border-destructive/40 bg-destructive/10 text-sm text-destructive">
+			{{ error }}
+		</div>
+
+		<div
+			v-else-if="!isLoading && roles.length === 0"
+			class="flex-1 flex items-center justify-center text-sm text-muted-foreground"
+		>
+			{{ __("No POS roles found. Create a POS Role first.") }}
+		</div>
+
+		<template v-else>
+			<div class="flex items-center gap-3 px-4 py-3 border-b border-border bg-muted/40">
+				<span class="text-sm font-medium whitespace-nowrap">
+					{{ __("Role") }}
+				</span>
+				<Autocomplete
+					v-model="selectedRole"
+					:options="roleOptions"
+					:placeholder="__('Select a role')"
+					:disabled="isLoading"
+					:clearable="false"
+					empty-text="No POS roles found"
+					class="w-64"
+				/>
+				<span v-if="selectedRole" class="text-xs text-muted-foreground">
+					{{ enabledCount }} {{ __("of") }} {{ totalCount }} {{ __("permissions enabled") }}
+				</span>
+			</div>
+
+			<div v-if="selectedRole" class="flex-1 min-h-0 overflow-auto p-4 space-y-6">
+				<section v-for="group in PERMISSION_GROUPS" :key="group.title">
+					<h2 class="text-xs font-semibold uppercase tracking-wide text-muted-foreground mb-2">
+						{{ __(group.title) }}
+					</h2>
+					<ul class="rounded border border-border divide-y divide-border/60">
+						<li
+							v-for="item in group.items"
+							:key="item.key"
+							class="flex items-center justify-between gap-4 px-3 py-2.5 hover:bg-muted/50"
+						>
+							<label :for="`perm-${item.key}`" class="text-sm cursor-pointer select-none">
+								{{ __(item.label) }}
+							</label>
+							<input
+								:id="`perm-${item.key}`"
+								type="checkbox"
+								class="w-4 h-4 accent-primary cursor-pointer disabled:cursor-wait disabled:opacity-50"
+								:checked="isEnabled(selectedRole, item.key)"
+								:disabled="isSaving(selectedRole, item.key)"
+								@change="onToggle(selectedRole, item.key, $event)"
+							/>
+						</li>
+					</ul>
+				</section>
+			</div>
+
+			<div
+				v-else
+				class="flex-1 flex items-center justify-center text-sm text-muted-foreground"
+			>
+				{{ __("Select a role to view its permissions.") }}
+			</div>
+		</template>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from "vue";
+import { RefreshCw } from "lucide-vue-next";
+import { Button } from "@/components/ui/button";
+import { Autocomplete } from "@/components/ui/autocomplete";
+import { call } from "@/services/api";
+import { showError, showSuccess } from "@/composables/useToast";
+import __ from "@/lib/translate";
+
+interface Role {
+	name: string;
+	role_name: string;
+}
+
+interface PermissionMatrix {
+	roles: Role[];
+	permissions: { name: string; label: string; group: string }[];
+	matrix: Record<string, Record<string, boolean>>;
+}
+
+const PERMISSION_GROUPS: { title: string; items: { key: string; label: string }[] }[] = [
+	{
+		title: "Billing & Invoicing",
+		items: [
+			{ key: "close_bill", label: "Close Bill" },
+			{ key: "close_shift", label: "Close Shift" },
+			{ key: "allow_reprint_invoice", label: "Reprint Invoice" },
+			{ key: "shift_report", label: "Shift Report" },
+			{ key: "allow_cancel_invoice", label: "Cancel Invoice" },
+			{ key: "unsettled_invoices", label: "Unsettled Invoices" },
+		],
+	},
+	{
+		title: "Discounts & Pricing",
+		items: [
+			{ key: "apply_additional_discount", label: "Apply Additional Discount" },
+			{ key: "apply_standard_discount", label: "Apply Standard Discount" },
+			{ key: "show_edit_discount_field", label: "Edit Discount Field" },
+			{ key: "edit_tax_template", label: "Edit Tax Template" },
+			{ key: "allow_change_price", label: "Change Price" },
+		],
+	},
+	{
+		title: "Sales Operations",
+		items: [
+			{ key: "quotation", label: "Quotation" },
+			{ key: "sale_return", label: "Sale Return" },
+		],
+	},
+	{
+		title: "Purchasing & Stock",
+		items: [
+			{ key: "local_purchase", label: "Local Purchase" },
+			{ key: "purchase_order", label: "Purchase Order" },
+			{ key: "purchase_invoice", label: "Purchase Invoice" },
+			{ key: "stock_adjustment", label: "Stock Adjustment" },
+			{ key: "stock_entry", label: "Stock Entry" },
+			{ key: "near_expiry_items", label: "Near Expiry Items" },
+		],
+	},
+	{
+		title: "Cash Management",
+		items: [
+			{ key: "expense", label: "Expense" },
+			{ key: "bank_drop", label: "Bank Drop" },
+		],
+	},
+	{
+		title: "Lists",
+		items: [
+			{ key: "list_of_invoices", label: "List of Invoices" },
+			{ key: "list_of_cancelled_invoices", label: "List of Cancelled Invoices" },
+			{ key: "list_of_errors", label: "List of Errors" },
+			{ key: "list_of_purchase_invoices", label: "List of Purchase Invoices" },
+			{ key: "list_of_quotations", label: "List of Quotations" },
+			{ key: "list_of_stock_entries", label: "List of Stock Entries" },
+			{ key: "list_of_local_purchases", label: "List of Local Purchases" },
+			{ key: "list_of_stock_adjustments", label: "List of Stock Adjustments" },
+			{ key: "list_of_expense", label: "List of Expenses" },
+			{ key: "list_of_bank_drops", label: "List of Bank Drops" },
+		],
+	},
+	{
+		title: "Reports",
+		items: [
+			{ key: "invoice_settlement_report", label: "Invoice Settlement Report" },
+			{ key: "sales_report_by_time", label: "Sales Report by Time" },
+			{ key: "sales_summary_by_hour", label: "Sales Summary by Hour" },
+			{ key: "current_stock_by_brand", label: "Current Stock by Brand" },
+			{ key: "stock_register", label: "Stock Register" },
+			{ key: "current_stock_report", label: "Current Stock Report" },
+		],
+	},
+	{
+		title: "Administration",
+		items: [{ key: "manage_role_permissions", label: "Manage Role Permissions" }],
+	},
+];
+
+const roles = ref<Role[]>([]);
+const matrix = ref<Record<string, Record<string, boolean>>>({});
+const saving = ref<Record<string, boolean>>({});
+const isLoading = ref(false);
+const error = ref("");
+const selectedRole = ref("");
+
+const roleOptions = computed(() =>
+	roles.value.map((role) => ({ label: role.role_name, value: role.name })),
+);
+
+const totalCount = computed(() =>
+	PERMISSION_GROUPS.reduce((sum, group) => sum + group.items.length, 0),
+);
+
+const enabledCount = computed(() => {
+	const perms = matrix.value[selectedRole.value] ?? {};
+	return Object.values(perms).filter(Boolean).length;
+});
+
+function rowKey(role: string, item: string): string {
+	return `${role}::${item}`;
+}
+
+function isEnabled(role: string, item: string): boolean {
+	return Boolean(matrix.value[role]?.[item]);
+}
+
+function isSaving(role: string, item: string): boolean {
+	return Boolean(saving.value[rowKey(role, item)]);
+}
+
+async function load(): Promise<void> {
+	isLoading.value = true;
+	error.value = "";
+	try {
+		const res = await call<PermissionMatrix>("xpos.api.auth.get_role_permission_matrix");
+		roles.value = res.roles ?? [];
+		matrix.value = res.matrix ?? {};
+		if (!roles.value.some((role) => role.name === selectedRole.value)) {
+			selectedRole.value = roles.value[0]?.name ?? "";
+		}
+	} catch (err) {
+		error.value = err instanceof Error ? err.message : String(err);
+	} finally {
+		isLoading.value = false;
+	}
+}
+
+async function onToggle(role: string, item: string, event: Event): Promise<void> {
+	const checked = (event.target as HTMLInputElement).checked;
+	const key = rowKey(role, item);
+	saving.value = { ...saving.value, [key]: true };
+	try {
+		await call("xpos.api.auth.set_role_permission", {
+			role,
+			permission: item,
+			enabled: checked ? 1 : 0,
+		});
+		if (!matrix.value[role]) matrix.value[role] = {};
+		matrix.value[role][item] = checked;
+		showSuccess(__("Permission updated"));
+	} catch (err) {
+		showError(err instanceof Error ? err.message : __("Failed to update permission"));
+		await load();
+	} finally {
+		const next = { ...saving.value };
+		delete next[key];
+		saving.value = next;
+	}
+}
+
+onMounted(load);
+</script>
diff --git a/frontend/tests/paymentDialogShortcuts.spec.ts b/frontend/tests/paymentDialogShortcuts.spec.ts
old mode 100644
new mode 100755
diff --git a/xpos/api/auth.py b/xpos/api/auth.py
index dbe624b..35884da 100755
--- a/xpos/api/auth.py
+++ b/xpos/api/auth.py
@@ -2,62 +2,225 @@
 # For license information, please see license.txt
 
 
-import json
-
 import frappe
 from frappe import _
-from frappe.utils import cint
-
-PERMISSION_FIELDS = [
-	"xpos_role",
-	"xpos_pos_profile",
-	"xpos_warehouse",
-	"xpos_company",
-	"xpos_theme",
-	"xpos_close_bill",
-	"xpos_allow_reprint_invoice",
-	"xpos_stock_adjustment",
-	"xpos_quotation",
-	"xpos_apply_additional_discount",
-	"xpos_apply_standard_discount",
-	"xpos_allow_change_price",
-	"xpos_show_edit_discount_field",
-	"xpos_show_edit_item_tax_template",
-	"xpos_allow_return",
-	"xpos_allow_cancel_invoice",
-	"xpos_allow_expense",
-	"xpos_allow_bank_drop",
-	"xpos_discount_limit",
-	"xpos_unsettled_invoices",
-	"xpos_local_purchase",
-	"xpos_purchase_order",
-	"xpos_purchase_invoice",
-	"xpos_stock_entry",
-	"xpos_near_expiry_items",
-	"xpos_list_of_invoices",
-	"xpos_list_of_cancelled_invoices",
-	"xpos_list_of_errors",
-	"xpos_list_of_purchase_invoices",
-	"xpos_list_of_quotations",
-	"xpos_list_of_stock_entries",
-	"xpos_list_of_local_purchases",
-	"xpos_list_of_stock_adjustments",
-	"xpos_list_of_expense",
-	"xpos_list_of_bank_drops",
-	"xpos_invoice_settlement_report",
-	"xpos_sales_report_by_time",
-	"xpos_sales_summary_by_hour",
-	"xpos_current_stock_by_brand",
-	"xpos_stock_register",
-	"xpos_current_stock_report",
-]
-
-
-def _get_user_fields():
-	"""Return the subset of PERMISSION_FIELDS that actually exist on tabUser."""
-	meta = frappe.get_meta("User")
-	existing = {f.fieldname for f in meta.fields}
-	return [f for f in PERMISSION_FIELDS if f in existing]
+from frappe.utils import cint, flt
+
+ALL_PERMISSION_KEYS = (
+	"close_bill",
+	"close_shift",
+	"allow_reprint_invoice",
+	"shift_report",
+	"allow_cancel_invoice",
+	"unsettled_invoices",
+	"apply_additional_discount",
+	"apply_standard_discount",
+	"show_edit_discount_field",
+	"edit_tax_template",
+	"allow_change_price",
+	"quotation",
+	"sale_return",
+	"local_purchase",
+	"purchase_order",
+	"purchase_invoice",
+	"stock_adjustment",
+	"stock_entry",
+	"near_expiry_items",
+	"expense",
+	"bank_drop",
+	"list_of_invoices",
+	"list_of_cancelled_invoices",
+	"list_of_errors",
+	"list_of_purchase_invoices",
+	"list_of_quotations",
+	"list_of_stock_entries",
+	"list_of_local_purchases",
+	"list_of_stock_adjustments",
+	"list_of_expense",
+	"list_of_bank_drops",
+	"invoice_settlement_report",
+	"sales_report_by_time",
+	"sales_summary_by_hour",
+	"current_stock_by_brand",
+	"stock_register",
+	"current_stock_report",
+	"manage_role_permissions",
+)
+
+DEFAULT_ROLE = "Cashier"
+DEFAULT_DISCOUNT_LIMIT = 100
+_ROLE_CACHE_KEY = "xpos_role_permissions"
+
+
+def _resolve_role_permissions(role_name: str) -> dict:
+	"""Build the full permission map for a role from its POS Role Permission rows.
+
+	Every key in :data:`ALL_PERMISSION_KEYS` is present in the result; flags
+	without an enabled child row default to ``False``.
+	"""
+	perms = {key: False for key in ALL_PERMISSION_KEYS}
+
+	if not role_name or not frappe.db.exists("POS Role", role_name):
+		return perms
+
+	rows = frappe.get_all(
+		"POS Role Permission",
+		filters={"parent": role_name, "parenttype": "POS Role"},
+		fields=["permission", "enabled"],
+		ignore_permissions=True,
+	)
+	for row in rows:
+		if row.permission in perms:
+			perms[row.permission] = bool(row.enabled)
+
+	return perms
+
+
+def _get_user_pos_role(user: str, pos_profile: str | None = None) -> str:
+	"""Resolve a user's POS Role from the POS Profile User child rows.
+
+	When ``pos_profile`` is given the matching profile's row is preferred;
+	otherwise the first profile row that carries a ``pos_role`` wins. Falls
+	back to :data:`DEFAULT_ROLE` when no assignment exists.
+	"""
+	filters = {"user": user, "parenttype": "POS Profile"}
+	if pos_profile:
+		filters["parent"] = pos_profile
+
+	rows = frappe.get_all(
+		"POS Profile User",
+		filters=filters,
+		fields=["pos_role"],
+		order_by="parent asc, idx asc",
+		ignore_permissions=True,
+	)
+	for row in rows:
+		if row.pos_role:
+			return row.pos_role
+
+	return DEFAULT_ROLE
+
+
+def _get_role_permissions(role_name: str) -> dict:
+	"""Cached accessor for :func:`_resolve_role_permissions`.
+
+	Cached per-role in ``frappe.cache`` and invalidated by the POS Role /
+	POS Permission doc_events (see :func:`clear_role_permission_cache`).
+	"""
+	role_name = role_name or DEFAULT_ROLE
+	return frappe.cache().hget(
+		_ROLE_CACHE_KEY,
+		role_name,
+		generator=lambda: _resolve_role_permissions(role_name),
+	)
+
+
+def clear_role_permission_cache(role_name: str | None = None) -> None:
+	"""Invalidate the cached permission map for a role (or all roles)."""
+	if role_name:
+		frappe.cache().hdel(_ROLE_CACHE_KEY, role_name)
+	else:
+		frappe.cache().delete_key(_ROLE_CACHE_KEY)
+
+
+def _all_enabled() -> dict:
+	"""Permission map with every flag granted (System Manager / Administrator)."""
+	return {key: True for key in ALL_PERMISSION_KEYS}
+
+
+def _is_superuser(user: str) -> bool:
+	return user == "Administrator" or "System Manager" in frappe.get_roles(user)
+
+
+def user_has_pos_permission(
+	key: str, user: str | None = None, pos_profile: str | None = None
+) -> bool:
+	"""Whether ``user``'s POS Role grants the permission ``key``.
+
+	Single source of truth for server-side POS permission checks. Resolves the
+	role from the user's POS Profile User row (preferring ``pos_profile`` when
+	supplied). Administrators and System Managers always qualify; Guest never.
+	"""
+	user = user or frappe.session.user
+	if user == "Guest":
+		return False
+	if _is_superuser(user):
+		return True
+	role_name = _get_user_pos_role(user, pos_profile)
+	return bool(_get_role_permissions(role_name).get(key))
+
+
+def can_manage_role_permissions(user: str | None = None) -> bool:
+	"""Whether ``user`` may view and edit the POS role permission matrix.
+
+	Administrators and System Managers always qualify. Any other user must
+	have the ``manage_role_permissions`` flag enabled on their POS Role.
+	"""
+	return user_has_pos_permission("manage_role_permissions", user)
+
+
+def _require_manage_permissions() -> None:
+	if not can_manage_role_permissions():
+		frappe.throw(
+			_("You are not permitted to manage POS role permissions."),
+			frappe.PermissionError,
+		)
+
+
+def _get_user_discount_limit(user_name: str, pos_profile: str | None) -> float:
+	"""Per-user discount cap, read from the POS Profile User child row."""
+	if not pos_profile:
+		return DEFAULT_DISCOUNT_LIMIT
+
+	value = frappe.db.get_value(
+		"POS Profile User",
+		{"parent": pos_profile, "parenttype": "POS Profile", "user": user_name},
+		"discount_limit",
+	)
+	return flt(value) if value not in (None, "") else DEFAULT_DISCOUNT_LIMIT
+
+
+@frappe.whitelist()
+def get_my_pos_permissions(pos_profile: str | None = None) -> dict:
+	"""Return POS permission flags for the current logged-in user (browser mode).
+
+	Resolves the user's POS Role from their POS Profile User row (preferring
+	``pos_profile`` when supplied). System Manager / Administrator receive every
+	flag enabled.
+	"""
+	user = frappe.session.user
+	if user == "Guest":
+		return {key: False for key in ALL_PERMISSION_KEYS}
+
+	if _is_superuser(user):
+		return _all_enabled()
+
+	role_name = _get_user_pos_role(user, pos_profile)
+	return _get_role_permissions(role_name)
+
+
+def get_current_user_permissions() -> dict:
+	"""Return the current session user's xPOS role and permission flags.
+
+	Used by ``extend_bootinfo`` so the web app has an authoritative source of
+	truth for permissions. System Manager / Administrator resolve to all
+	permissions enabled.
+	"""
+	user = frappe.session.user
+	if user == "Guest":
+		return {}
+
+	role_name = _get_user_pos_role(user)
+
+	if _is_superuser(user):
+		permissions = _all_enabled()
+	else:
+		permissions = _get_role_permissions(role_name)
+
+	return {
+		"role": role_name,
+		"permissions": permissions,
+	}
 
 
 @frappe.whitelist()
@@ -77,19 +240,28 @@ def get_pos_users(
 	Returns:
 	    list[dict]: One record per user with at minimum:
 	        name, username, full_name, enabled, password_hash (empty),
-	        role, pos_profile, warehouse, company, theme,
-	        and all available xpos permission flag fields.
+	        role, pos_profile, warehouse, company, theme, discount_limit,
+	        and every permission flag in :data:`ALL_PERMISSION_KEYS`, resolved
+	        from the POS Role assigned on the user's POS Profile User row.
 	"""
 	limit_start = cint(limit_start)
 	limit_page_length = cint(limit_page_length)
 
 	profile_users = frappe.db.sql(
 		"""
-        SELECT DISTINCT pu.user
-        FROM `tabPOS Profile User` pu
-        INNER JOIN `tabPOS Profile` pp ON pp.name = pu.parent
-        WHERE pp.disabled = 0
-        ORDER BY pu.user
+        SELECT user, pos_profile, pos_role, discount_limit, warehouse, company
+        FROM (
+            SELECT pu.user, pu.parent AS pos_profile, pu.pos_role, pu.discount_limit,
+                   pp.warehouse, pp.company,
+                   ROW_NUMBER() OVER (
+                       PARTITION BY pu.user ORDER BY pu.parent ASC, pu.idx ASC
+                   ) AS rn
+            FROM `tabPOS Profile User` pu
+            INNER JOIN `tabPOS Profile` pp ON pp.name = pu.parent
+            WHERE pp.disabled = 0
+        ) ranked
+        WHERE rn = 1
+        ORDER BY user
         LIMIT %(limit)s OFFSET %(offset)s
         """,
 		{"limit": limit_page_length, "offset": limit_start},
@@ -99,21 +271,24 @@ def get_pos_users(
 	if not profile_users:
 		return []
 
-	user_names = [r.user for r in profile_users]
-
-	base_fields = ["name", "username", "full_name", "enabled", "modified"]
-	available_xpos_fields = _get_user_fields()
-	all_fields = base_fields + available_xpos_fields
-
-	users = frappe.get_all(
-		"User",
-		filters={"name": ["in", user_names]},
-		fields=all_fields,
-		ignore_permissions=True,
-	)
+	user_meta = {
+		u.name: u
+		for u in frappe.get_all(
+			"User",
+			filters={"name": ["in", [r.user for r in profile_users]]},
+			fields=["name", "username", "full_name", "enabled", "modified"],
+			ignore_permissions=True,
+		)
+	}
 
 	results = []
-	for user in users:
+	for pu in profile_users:
+		user = user_meta.get(pu.user)
+		if not user:
+			continue
+		role_name = pu.pos_role or DEFAULT_ROLE
+		perms = _get_role_permissions(role_name)
+		discount_limit = flt(pu.discount_limit) if pu.discount_limit not in (None, "") else DEFAULT_DISCOUNT_LIMIT
 		row = {
 			"name": user.name,
 			"username": user.username or user.name,
@@ -121,26 +296,76 @@ def get_pos_users(
 			"enabled": cint(user.enabled),
 			"modified": str(user.modified) if user.modified else None,
 			"password_hash": "",
-			"role": user.get("xpos_role") or "Cashier",
-			"pos_profile": user.get("xpos_pos_profile") or "",
-			"warehouse": user.get("xpos_warehouse") or "",
-			"company": user.get("xpos_company") or "",
-			"theme": user.get("xpos_theme") or "Default",
-			"close_bill": cint(user.get("xpos_close_bill", 1)),
-			"allow_reprint_invoice": cint(user.get("xpos_allow_reprint_invoice", 0)),
-			"stock_adjustment": cint(user.get("xpos_stock_adjustment", 0)),
-			"quotation": cint(user.get("xpos_quotation", 0)),
-			"apply_additional_discount": cint(user.get("xpos_apply_additional_discount", 0)),
-			"apply_standard_discount": cint(user.get("xpos_apply_standard_discount", 0)),
-			"allow_change_price": cint(user.get("xpos_allow_change_price", 0)),
-			"show_edit_discount_field": cint(user.get("xpos_show_edit_discount_field", 0)),
-			"show_edit_item_tax_template": cint(user.get("xpos_show_edit_item_tax_template", 0)),
-			"allow_return": cint(user.get("xpos_allow_return", 0)),
-			"allow_cancel_invoice": cint(user.get("xpos_allow_cancel_invoice", 0)),
-			"allow_expense": cint(user.get("xpos_allow_expense", 0)),
-			"allow_bank_drop": cint(user.get("xpos_allow_bank_drop", 0)),
-			"discount_limit": user.get("xpos_discount_limit") or 100,
+			"role": role_name,
+			"pos_profile": pu.pos_profile or "",
+			"warehouse": pu.warehouse or "",
+			"company": pu.company or "",
+			"theme": "Default",
+			"discount_limit": discount_limit,
+			**{key: cint(perms.get(key, False)) for key in ALL_PERMISSION_KEYS},
 		}
 		results.append(row)
 
 	return results
+
+
+@frappe.whitelist()
+def get_role_permission_matrix() -> dict:
+	"""Return the full role/permission matrix for the admin UI.
+
+	Shape::
+
+	    {
+	        "roles": [{"name", "role_name"}],
+	        "permissions": [{"name", "label", "group"}],
+	        "matrix": {role_name: {permission_name: bool}},
+	    }
+	"""
+	_require_manage_permissions()
+	roles = frappe.get_all(
+		"POS Role",
+		fields=["name", "role_name"],
+		order_by="role_name asc",
+		ignore_permissions=True,
+	)
+	permissions = frappe.get_all(
+		"POS Permission",
+		fields=["name", "permission_label as label"],
+		ignore_permissions=True,
+	)
+	# Order permissions by the canonical catalog order; tag with group.
+	from xpos.install import POS_PERMISSIONS
+
+	group_of = {name: group for name, _label, group in POS_PERMISSIONS}
+	order = {name: idx for idx, (name, _l, _g) in enumerate(POS_PERMISSIONS)}
+	for perm in permissions:
+		perm["group"] = group_of.get(perm.name, "Other")
+	permissions.sort(key=lambda p: order.get(p["name"], len(order)))
+
+	matrix: dict[str, dict[str, bool]] = {}
+	for role in roles:
+		matrix[role.name] = _resolve_role_permissions(role.name)
+
+	return {"roles": roles, "permissions": permissions, "matrix": matrix}
+
+
+@frappe.whitelist()
+def set_role_permission(role: str, permission: str, enabled) -> dict:
+	"""Upsert a single POS Role Permission child row and bust the cache."""
+	_require_manage_permissions()
+	if not frappe.db.exists("POS Role", role):
+		frappe.throw(_("POS Role {0} not found").format(role))
+
+	enabled = 1 if cint(enabled) else 0
+	doc = frappe.get_doc("POS Role", role)
+
+	target = next((row for row in doc.permissions if row.permission == permission), None)
+	if target:
+		target.enabled = enabled
+	else:
+		doc.append("permissions", {"permission": permission, "enabled": enabled})
+
+	doc.save(ignore_permissions=True)
+	clear_role_permission_cache(role)
+
+	return {"role": role, "permission": permission, "enabled": enabled}
diff --git a/xpos/api/print_formats.py b/xpos/api/print_formats.py
index e682b8e..4b1d9bc 100755
--- a/xpos/api/print_formats.py
+++ b/xpos/api/print_formats.py
@@ -8,6 +8,10 @@
 """
 
 import frappe
+from frappe import _
+from frappe.utils import cint
+
+REPRINT_DOCTYPES = ("Sales Invoice", "POS Invoice")
 
 
 @frappe.whitelist()
@@ -19,3 +23,47 @@ def get_print_formats(doctype: str = "Sales Invoice"):
 		fields=["name"],
 	)
 	return [p.name for p in print_formats]
+
+
+def _can_reprint(user: str | None = None) -> bool:
+	"""Whether ``user`` may reprint a posted POS invoice (the ``allow_reprint_invoice`` right).
+
+	Resolved from the user's POS Role permission map so it stays in sync with
+	the Role Permissions admin screen. Administrators / System Managers always
+	qualify.
+	"""
+	from xpos.api.auth import user_has_pos_permission
+
+	return user_has_pos_permission("allow_reprint_invoice", user)
+
+
+def invoice_has_permission(doc, ptype: str, user: str) -> bool:
+	"""``has_permission`` hook restricting reprinting of POS invoices.
+
+	The first receipt (``print_count`` == 0) is always allowed so cashiers
+	can print at the point of sale; every subsequent print is a reprint and
+	requires the ``allow_reprint_invoice`` right. Non-print actions and
+	non-POS invoices defer to Frappe's normal role permissions.
+	"""
+	if ptype != "print":
+		return True
+	if not getattr(doc, "is_pos", 0):
+		return True
+	if cint(getattr(doc, "print_count", 0)) < 1:
+		return True
+	return _can_reprint(user)
+
+
+@frappe.whitelist()
+def mark_invoice_printed(doctype: str, name: str) -> dict:
+	"""Record that a POS receipt has printed, so later prints count as reprints.
+
+	Called by the POS frontend right after the point-of-sale receipt prints.
+	Uses a direct db write because the counter is an internal marker, not
+	user-editable content; ``update_modified=False`` avoids needless re-sync.
+	"""
+	if doctype not in REPRINT_DOCTYPES:
+		frappe.throw(_("Unsupported doctype for print tracking: {0}").format(doctype))
+	current = cint(frappe.db.get_value(doctype, name, "print_count"))
+	frappe.db.set_value(doctype, name, "print_count", current + 1, update_modified=False)
+	return {"name": name, "print_count": current + 1}
diff --git a/xpos/api/reports.py b/xpos/api/reports.py
new file mode 100755
index 0000000..9c864ed
--- /dev/null
+++ b/xpos/api/reports.py
@@ -0,0 +1,209 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+"""Report metadata for the X POS frontend report viewer.
+
+The frontend renders a generic, Frappe-style report view (filter bar + data
+table). The filter configuration for each report lives here so the frontend no
+longer hardcodes it; this mirrors the filters defined in each report's desk
+``*.js`` file but is JSON-serialisable.
+
+Report data itself is still fetched through the standard
+``frappe.desk.query_report.run`` endpoint.
+"""
+
+import frappe
+from frappe import _
+from frappe.utils import add_months, today
+
+
+def _company_default() -> str:
+	"""Resolve the user's default company, mirroring the desk ``*.js`` defaults."""
+	return frappe.defaults.get_user_default("Company") or frappe.defaults.get_default("company") or ""
+
+
+def _company_filter():
+	return {
+		"fieldname": "company",
+		"label": "Company",
+		"type": "link",
+		"doctype": "Company",
+		"required": True,
+		"clears": ["warehouse"],
+	}
+
+
+def _warehouse_filter(required: bool = False, multi: bool = False):
+	return {
+		"fieldname": "warehouse",
+		"label": "Warehouses" if multi else "Warehouse",
+		"type": "multi-link" if multi else "link",
+		"doctype": "Warehouse",
+		"required": required,
+		# "$company" resolves to the current value of the company filter.
+		"getQueryFilters": {"company": "$company", "is_group": 0} if not multi else {"company": "$company"},
+	}
+
+
+def _multi_link(fieldname: str, label: str, doctype: str, required: bool = False):
+	return {
+		"fieldname": fieldname,
+		"label": label,
+		"type": "multi-link",
+		"doctype": doctype,
+		"required": required,
+	}
+
+
+def _link(fieldname: str, label: str, doctype: str, required: bool = False):
+	return {
+		"fieldname": fieldname,
+		"label": label,
+		"type": "link",
+		"doctype": doctype,
+		"required": required,
+	}
+
+
+def _date(fieldname: str, label: str, required: bool = False, default=None):
+	field = {"fieldname": fieldname, "label": label, "type": "date", "required": required}
+	if default is not None:
+		field["defaultValue"] = default
+	return field
+
+
+def _filters() -> dict:
+	return {
+		"Current Stock Report": [
+			_company_filter(),
+			_warehouse_filter(required=True),
+			_link("supplier", "Supplier", "Supplier"),
+			_link("brand", "Brand", "Brand"),
+			_link("item_group", "Item Group", "Item Group"),
+		],
+		"Current Stock By Brand": [
+			_multi_link("brand", "Brand", "Brand", required=True),
+		],
+		"Current Stock Summary": [
+			_company_filter(),
+			_warehouse_filter(required=True),
+		],
+		"Current Stock With Levels": [
+			_company_filter(),
+			_warehouse_filter(required=False),
+		],
+		"Dead Stock Report": [
+			_company_filter(),
+			_warehouse_filter(required=False),
+			{"fieldname": "days", "label": "Days", "type": "integer", "required": True, "defaultValue": 30},
+			{
+				"fieldname": "min_value",
+				"label": "Minimum Value",
+				"type": "float",
+				"required": True,
+				"defaultValue": 1000,
+			},
+			_multi_link("supplier", "Supplier", "Supplier"),
+		],
+		"Stock Value By Warehouse": [
+			_company_filter(),
+		],
+		"Stock Value Summary By Date": [
+			_company_filter(),
+			_date("from_posting_date", "From Posting Date", required=True, default=today()),
+		],
+		"Warehouse Stock Movement": [
+			_company_filter(),
+			_date("from_date", "From Date", required=True, default=today()),
+			_date("to_date", "To Date", required=True, default=today()),
+		],
+		"Branch Item Summary": [
+			_company_filter(),
+			_warehouse_filter(required=True),
+			_date("from_date", "From Date", required=True, default=today()),
+			_date("to_date", "To Date", required=True, default=today()),
+		],
+		"Branch Set Summary": [
+			_company_filter(),
+			_warehouse_filter(required=True),
+			_date("date", "Date", required=True, default=today()),
+		],
+		"Low Qty Sales Report": [
+			_company_filter(),
+			_date("from_date", "From Date", required=True, default=add_months(today(), -1)),
+			_date("to_date", "To Date", required=True, default=today()),
+			{"fieldname": "min_qty", "label": "Min Qty", "type": "integer", "required": True, "defaultValue": 10},
+		],
+		"Zero Qty Sales Report": [
+			_company_filter(),
+			_date("from_date", "From Date", required=True, default=today()),
+			_date("to_date", "To Date", required=True, default=today()),
+		],
+		"Slow Fast Moving Items": [
+			_company_filter(),
+			_date("from_date", "From Date", required=True, default=add_months(today(), -1)),
+			_date("to_date", "To Date", required=True, default=today()),
+			_multi_link("supplier", "Supplier", "Supplier"),
+		],
+		"Stock Audit Report": [
+			_company_filter(),
+			_warehouse_filter(required=False, multi=True),
+			_multi_link("item_group", "Item Group", "Item Group"),
+			_multi_link("brand", "Brand", "Brand"),
+			_multi_link("supplier", "Supplier", "Supplier"),
+		],
+		"Purchase Order Report": [
+			_company_filter(),
+			_link("supplier", "Supplier", "Supplier", required=True),
+			_date("from_date", "From Date", required=True),
+			_date("to_date", "To Date", required=True),
+			{
+				"fieldname": "type",
+				"label": "Type",
+				"type": "select",
+				"required": True,
+				"defaultValue": "All",
+				"options": [
+					{"label": "All", "value": "All"},
+					{"label": "Based on ReOrder Level", "value": "Based on ReOrder Level"},
+					{"label": "Based on Sales", "value": "Based on Sales"},
+				],
+			},
+		],
+		"POS Shift Reconciliation": [
+			_link("pos_opening_shift", "Opening Shift", "POS Opening Shift"),
+			_link("company", "Company", "Company"),
+			_link("pos_profile", "POS Profile", "POS Profile"),
+			_date("from_date", "From Date"),
+			_date("to_date", "To Date"),
+		],
+	}
+
+
+def _apply_company_defaults(filters: list) -> list:
+	"""Inject the user's default company into the company filter at request time."""
+	company = _company_default()
+	if not company:
+		return filters
+	for field in filters:
+		if field.get("fieldname") == "company" and "defaultValue" not in field:
+			field["defaultValue"] = company
+	return filters
+
+
+@frappe.whitelist()
+def get_report_meta(report: str) -> dict:
+	"""Return the JSON filter configuration for a report.
+
+	Columns are intentionally omitted — they arrive with the data from
+	``frappe.desk.query_report.run`` so no report execution is needed here.
+	"""
+	registry = _filters()
+	filters = registry.get(report)
+	if filters is None:
+		frappe.throw(_("Unknown report: {0}").format(report), frappe.DoesNotExistError)
+
+	if not frappe.has_permission("Report", "read"):
+		frappe.throw(_("Not permitted to view reports"), frappe.PermissionError)
+
+	return {"filters": _apply_company_defaults(filters)}
diff --git a/xpos/api/shifts.py b/xpos/api/shifts.py
index 5970a0d..a6940b5 100755
--- a/xpos/api/shifts.py
+++ b/xpos/api/shifts.py
@@ -6,7 +6,7 @@
 import frappe
 from frappe import Any, _
 from frappe.utils import cint, flt, now_datetime, nowdate
-from xpos.api.utilities import get_invoice_type, is_pos_cashier
+from xpos.api.utilities import can_close_shift, get_invoice_type, is_pos_cashier
 
 
 def _row_value(row: dict | object, key: str, default: Any | None = None):
@@ -142,6 +142,9 @@ def close_shift(opening_shift: str, closing_details: str | list[dict] | None):
 	- Tax summary per shift
 	- Payment reconciliation with expected vs actual amounts
 	"""
+	if not can_close_shift():
+		frappe.throw(_("Only a Supervisor can close a shift."), frappe.PermissionError)
+
 	closing_details = json.loads(closing_details) if isinstance(closing_details, str) else closing_details
 
 	opening = frappe.get_doc("POS Opening Shift", opening_shift)
@@ -515,6 +518,9 @@ def create_closing_shift(data: str | dict, local_id: str | None = None) -> dict:
 	Returns:
 	    dict with 'name' key containing the server docname
 	"""
+	if not can_close_shift():
+		frappe.throw(_("Only a Supervisor can close a shift."), frappe.PermissionError)
+
 	data = json.loads(data) if isinstance(data, str) else data
 
 	if local_id:
diff --git a/xpos/api/tests/test_fbr_integration.py b/xpos/api/tests/test_fbr_integration.py
old mode 100644
new mode 100755
diff --git a/xpos/api/utilities.py b/xpos/api/utilities.py
index 03ab6da..9d984cc 100755
--- a/xpos/api/utilities.py
+++ b/xpos/api/utilities.py
@@ -202,4 +202,16 @@ def is_pos_cashier(user: str | None = None, pos_profile: str | None = None) -> b
 			{"parent": pos_profile, "parenttype": "POS Profile", "user": user},
 			"is_cashier",
 		)
-	)
\ No newline at end of file
+	)
+
+
+def can_close_shift(user: str | None = None, pos_profile: str | None = None) -> bool:
+	"""Return whether ``user`` may close a cashier/sales shift (the ``close_shift`` right).
+
+	Resolved from the user's POS Role permission map so it stays in sync with
+	the Role Permissions admin screen. Administrators / System Managers always
+	qualify.
+	"""
+	from xpos.api.auth import user_has_pos_permission
+
+	return user_has_pos_permission("close_shift", user, pos_profile)
\ No newline at end of file
diff --git a/xpos/desktop_icon/x_pos.json b/xpos/desktop_icon/x_pos.json
old mode 100644
new mode 100755
diff --git a/xpos/hooks.py b/xpos/hooks.py
index 028b3ce..057bcba 100755
--- a/xpos/hooks.py
+++ b/xpos/hooks.py
@@ -93,7 +93,7 @@
 # ------------
 
 # before_install = "xpos.install.before_install"
-# after_install = "xpos.install.after_install"
+after_install = "xpos.install.after_install"
 
 # Uninstallation
 # ------------
@@ -129,10 +129,11 @@
 # permission_query_conditions = {
 # 	"Event": "frappe.desk.doctype.event.event.get_permission_query_conditions",
 # }
-#
-# has_permission = {
-# 	"Event": "frappe.desk.doctype.event.event.has_permission",
-# }
+
+has_permission = {
+	"Sales Invoice": "xpos.api.print_formats.invoice_has_permission",
+	"POS Invoice": "xpos.api.print_formats.invoice_has_permission",
+}
 
 # DocType Class
 # ---------------
diff --git a/xpos/install.py b/xpos/install.py
new file mode 100755
index 0000000..475fedd
--- /dev/null
+++ b/xpos/install.py
@@ -0,0 +1,107 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+"""
+Install-time seeding for the xPOS role-based permission system.
+"""
+
+import frappe
+
+POS_PERMISSIONS = (
+	# Billing & Invoicing
+	("close_bill", "Close Bill", "Billing & Invoicing"),
+	("close_shift", "Close Shift", "Billing & Invoicing"),
+	("allow_reprint_invoice", "Reprint Invoice", "Billing & Invoicing"),
+	("shift_report", "Shift Report", "Billing & Invoicing"),
+	("allow_cancel_invoice", "Cancel Invoice", "Billing & Invoicing"),
+	("unsettled_invoices", "Unsettled Invoices", "Billing & Invoicing"),
+	# Discounts & Pricing
+	("apply_additional_discount", "Apply Additional Discount", "Discounts & Pricing"),
+	("apply_standard_discount", "Apply Standard Discount", "Discounts & Pricing"),
+	("show_edit_discount_field", "Edit Discount Field", "Discounts & Pricing"),
+	("edit_tax_template", "Edit Tax Template", "Discounts & Pricing"),
+	("allow_change_price", "Change Price", "Discounts & Pricing"),
+	# Sales Operations
+	("quotation", "Quotation", "Sales Operations"),
+	("sale_return", "Sale Return", "Sales Operations"),
+	# Purchasing & Stock
+	("local_purchase", "Local Purchase", "Purchasing & Stock"),
+	("purchase_order", "Purchase Order", "Purchasing & Stock"),
+	("purchase_invoice", "Purchase Invoice", "Purchasing & Stock"),
+	("stock_adjustment", "Stock Adjustment", "Purchasing & Stock"),
+	("stock_entry", "Stock Entry", "Purchasing & Stock"),
+	("near_expiry_items", "Near Expiry Items", "Purchasing & Stock"),
+	# Cash Management
+	("expense", "Expense", "Cash Management"),
+	("bank_drop", "Bank Drop", "Cash Management"),
+	# Lists
+	("list_of_invoices", "List of Invoices", "Lists"),
+	("list_of_cancelled_invoices", "List of Cancelled Invoices", "Lists"),
+	("list_of_errors", "List of Errors", "Lists"),
+	("list_of_purchase_invoices", "List of Purchase Invoices", "Lists"),
+	("list_of_quotations", "List of Quotations", "Lists"),
+	("list_of_stock_entries", "List of Stock Entries", "Lists"),
+	("list_of_local_purchases", "List of Local Purchases", "Lists"),
+	("list_of_stock_adjustments", "List of Stock Adjustments", "Lists"),
+	("list_of_expense", "List of Expenses", "Lists"),
+	("list_of_bank_drops", "List of Bank Drops", "Lists"),
+	# Reports
+	("invoice_settlement_report", "Invoice Settlement Report", "Reports"),
+	("sales_report_by_time", "Sales Report by Time", "Reports"),
+	("sales_summary_by_hour", "Sales Summary by Hour", "Reports"),
+	("current_stock_by_brand", "Current Stock by Brand", "Reports"),
+	("stock_register", "Stock Register", "Reports"),
+	("current_stock_report", "Current Stock Report", "Reports"),
+	# Administration
+	("manage_role_permissions", "Manage Role Permissions", "Administration"),
+)
+
+ALL_PERMISSION_NAMES = tuple(name for name, _label, _group in POS_PERMISSIONS)
+
+_CASHIER_ENABLED = {"close_bill", "list_of_invoices"}
+_MANAGER_DISABLED = {"list_of_errors", "manage_role_permissions"}
+
+DEFAULT_ROLES = (
+	("Cashier", _CASHIER_ENABLED),
+	("Manager", set(ALL_PERMISSION_NAMES) - _MANAGER_DISABLED),
+	("Administrator", set(ALL_PERMISSION_NAMES)),
+)
+
+
+def after_install():
+	seed_pos_permissions()
+	seed_default_roles()
+
+
+def seed_pos_permissions():
+	"""Upsert the static POS Permission catalog. Idempotent."""
+	for permission_name, permission_label, _group in POS_PERMISSIONS:
+		if frappe.db.exists("POS Permission", permission_name):
+			continue
+		frappe.get_doc(
+			{
+				"doctype": "POS Permission",
+				"permission_name": permission_name,
+				"permission_label": permission_label,
+			}
+		).insert(ignore_permissions=True)
+
+
+def seed_default_roles():
+	"""Create the default POS Role records with their child permission rows.
+
+	Skips roles that already exist so existing customisations are preserved.
+	"""
+	for role_name, enabled_set in DEFAULT_ROLES:
+		if frappe.db.exists("POS Role", role_name):
+			continue
+		role = frappe.get_doc({"doctype": "POS Role", "role_name": role_name})
+		for permission_name in ALL_PERMISSION_NAMES:
+			role.append(
+				"permissions",
+				{
+					"permission": permission_name,
+					"enabled": 1 if permission_name in enabled_set else 0,
+				},
+			)
+		role.insert(ignore_permissions=True)
diff --git a/xpos/patches.txt b/xpos/patches.txt
index 9000ac8..99c2d36 100755
--- a/xpos/patches.txt
+++ b/xpos/patches.txt
@@ -7,4 +7,5 @@
 xpos.patches.add_composite_indexes
 xpos.patches.add_item_fulltext_index
 xpos.patches.remove_unused_pos_profile_discount_fields
-execute:frappe.db.delete("Custom Field", filters={"fieldname": ["IN", ["create_pos_invoice_instead_of_sales_invoice", "auto_delete_draft_invoice", "allow_delete", "display_authorization_code", "fetch_items_directly_from_server"]]})
\ No newline at end of file
+execute:frappe.db.delete("Custom Field", filters={"fieldname": ["IN", ["create_pos_invoice_instead_of_sales_invoice", "auto_delete_draft_invoice", "allow_delete", "display_authorization_code", "fetch_items_directly_from_server"]]})
+xpos.patches.seed_pos_role_permissions
\ No newline at end of file
diff --git a/xpos/patches/remove_unused_pos_profile_discount_fields.py b/xpos/patches/remove_unused_pos_profile_discount_fields.py
old mode 100644
new mode 100755
diff --git a/xpos/patches/seed_pos_role_permissions.py b/xpos/patches/seed_pos_role_permissions.py
new file mode 100644
index 0000000..92bebac
--- /dev/null
+++ b/xpos/patches/seed_pos_role_permissions.py
@@ -0,0 +1,9 @@
+from xpos.install import seed_default_roles, seed_pos_permissions
+
+
+def execute():
+    """
+	Seed the POS Permission catalog and default POS Roles on existing sites.
+	"""
+    seed_pos_permissions()
+    seed_default_roles()
diff --git a/xpos/startup/boot.py b/xpos/startup/boot.py
index 90d0dfd..1e6b9a9 100755
--- a/xpos/startup/boot.py
+++ b/xpos/startup/boot.py
@@ -3,6 +3,8 @@
 
 import frappe
 
+from xpos.api.auth import can_manage_role_permissions, get_current_user_permissions
+
 
 def extend_bootinfo(bootinfo):
 	"""extending boot session"""
@@ -25,3 +27,12 @@ def extend_bootinfo(bootinfo):
 		bootinfo.buying_settings = frappe.get_single("Buying Settings")
 		bootinfo.stock_settings = frappe.get_single("Stock Settings")
 		bootinfo.pos_settings = frappe.get_single("POS Settings")
+
+		user_rights = get_current_user_permissions()
+		bootinfo.xpos_role = user_rights.get("role")
+		bootinfo.xpos_permissions = user_rights.get("permissions")
+		bootinfo.xpos_is_system_manager = (
+			frappe.session.user == "Administrator"
+			or "System Manager" in frappe.get_roles(frappe.session.user)
+		)
+		bootinfo.xpos_can_manage_permissions = can_manage_role_permissions()
diff --git a/xpos/workspace_sidebar/x_pos.json b/xpos/workspace_sidebar/x_pos.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/api/item_processing/barcode.py b/xpos/x_pos/api/item_processing/barcode.py
index 85deba4..a243ca3 100755
--- a/xpos/x_pos/api/item_processing/barcode.py
+++ b/xpos/x_pos/api/item_processing/barcode.py
@@ -13,7 +13,7 @@ def _get_scale_barcode_settings():
 	except frappe.DoesNotExistError:
 		return None
 	except Exception:
-		frappe.log_error("Unable to load Scale Barcode Settings", "POS Awesome")
+		frappe.log_error("Unable to load Scale Barcode Settings", "X POS")
 		return None
 
 
diff --git a/xpos/x_pos/api/test_invoice_delivery_charges.py b/xpos/x_pos/api/test_invoice_delivery_charges.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/custom/mode_of_payment.json b/xpos/x_pos/custom/mode_of_payment.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/custom/pos_invoice.json b/xpos/x_pos/custom/pos_invoice.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/custom/pos_invoice_item.json b/xpos/x_pos/custom/pos_invoice_item.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/custom/pos_profile_user.json b/xpos/x_pos/custom/pos_profile_user.json
old mode 100644
new mode 100755
index e640be9..9731a00
--- a/xpos/x_pos/custom/pos_profile_user.json
+++ b/xpos/x_pos/custom/pos_profile_user.json
@@ -5,13 +5,147 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
+   "alignment": "",
    "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
+   "button_color": "",
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2026-05-29 00:00:00.000000",
+   "creation": "2026-06-04 14:50:21.803508",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "POS Profile User",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "pos_role",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 4,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "discount_limit",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "POS Role",
+   "length": 0,
+   "link_filters": null,
+   "mandatory_depends_on": null,
+   "modified": "2026-06-04 14:50:38.750460",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "POS Profile User-custom_pos_role",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "POS Role",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "placeholder": null,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "alignment": "",
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "button_color": "",
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2026-06-04 00:00:00",
+   "default": "0",
+   "depends_on": null,
+   "description": "Maximum discount percentage this user may apply at POS. Defaults to 100 (no cap).",
+   "docstatus": 0,
+   "dt": "POS Profile User",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "discount_limit",
+   "fieldtype": "Percent",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 4,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "is_cashier",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Discount Limit",
+   "length": 0,
+   "link_filters": null,
+   "mandatory_depends_on": null,
+   "modified": "2026-06-04 00:00:00",
+   "modified_by": "Administrator",
+   "module": "X POS",
+   "name": "POS Profile User-discount_limit",
+   "no_copy": 0,
+   "non_negative": 1,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "placeholder": null,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "alignment": "",
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "button_color": "",
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2026-05-29 00:00:00",
    "default": "0",
    "depends_on": null,
    "description": "If checked, this user is a cashier and may open the Cashier screen to settle (close) bills sent from POS terminals.",
@@ -25,7 +159,7 @@
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 0,
+   "idx": 3,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
@@ -39,7 +173,7 @@
    "length": 0,
    "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2026-05-29 00:00:00.000000",
+   "modified": "2026-05-29 00:00:00",
    "modified_by": "Administrator",
    "module": "X POS",
    "name": "POS Profile User-is_cashier",
@@ -68,6 +202,30 @@
  "custom_perms": [],
  "doctype": "POS Profile User",
  "links": [],
- "property_setters": [],
+ "property_setters": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2026-06-04 14:50:22.013939",
+   "default_value": null,
+   "doc_type": "POS Profile User",
+   "docstatus": 0,
+   "doctype_or_field": "DocType",
+   "field_name": null,
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2026-06-04 14:50:22.013939",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "POS Profile User-main-field_order",
+   "owner": "Administrator",
+   "property": "field_order",
+   "property_type": "Data",
+   "row_name": null,
+   "value": "[\"default\", \"user\", \"is_cashier\", \"discount_limit\", \"custom_pos_role\"]"
+  }
+ ],
  "sync_on_migrate": 1
-}
+}
\ No newline at end of file
diff --git a/xpos/x_pos/doctype/pos_allowed_expense_account/__init__.py b/xpos/x_pos/doctype/pos_allowed_expense_account/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.json b/xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.py b/xpos/x_pos/doctype/pos_allowed_expense_account/pos_allowed_expense_account.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_allowed_source_account/__init__.py b/xpos/x_pos/doctype/pos_allowed_source_account/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.json b/xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.py b/xpos/x_pos/doctype/pos_allowed_source_account/pos_allowed_source_account.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_cash_movement/__init__.py b/xpos/x_pos/doctype/pos_cash_movement/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.js b/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.js
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.json b/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.py b/xpos/x_pos/doctype/pos_cash_movement/pos_cash_movement.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_cash_movement/test_pos_cash_movement.py b/xpos/x_pos/doctype/pos_cash_movement/test_pos_cash_movement.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift/__init__.py b/xpos/x_pos/doctype/pos_closing_shift/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.json b/xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.py b/xpos/x_pos/doctype/pos_closing_shift/pos_closing_shift.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift/test_pos_closing_shift.py b/xpos/x_pos/doctype/pos_closing_shift/test_pos_closing_shift.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_detail/__init__.py b/xpos/x_pos/doctype/pos_closing_shift_detail/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.json b/xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.py b/xpos/x_pos/doctype/pos_closing_shift_detail/pos_closing_shift_detail.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_taxes/__init__.py b/xpos/x_pos/doctype/pos_closing_shift_taxes/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.json b/xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.py b/xpos/x_pos/doctype/pos_closing_shift_taxes/pos_closing_shift_taxes.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon/__init__.py b/xpos/x_pos/doctype/pos_coupon/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon/pos_coupon.js b/xpos/x_pos/doctype/pos_coupon/pos_coupon.js
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon/pos_coupon.json b/xpos/x_pos/doctype/pos_coupon/pos_coupon.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon/pos_coupon.py b/xpos/x_pos/doctype/pos_coupon/pos_coupon.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon/test_pos_coupon.py b/xpos/x_pos/doctype/pos_coupon/test_pos_coupon.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon_detail/__init__.py b/xpos/x_pos/doctype/pos_coupon_detail/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.json b/xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.py b/xpos/x_pos/doctype/pos_coupon_detail/pos_coupon_detail.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer/__init__.py b/xpos/x_pos/doctype/pos_offer/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer/pos_offer.js b/xpos/x_pos/doctype/pos_offer/pos_offer.js
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer/pos_offer.json b/xpos/x_pos/doctype/pos_offer/pos_offer.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer/pos_offer.py b/xpos/x_pos/doctype/pos_offer/pos_offer.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer/test_pos_offer.py b/xpos/x_pos/doctype/pos_offer/test_pos_offer.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer_detail/__init__.py b/xpos/x_pos/doctype/pos_offer_detail/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.json b/xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.py b/xpos/x_pos/doctype/pos_offer_detail/pos_offer_detail.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift/__init__.py b/xpos/x_pos/doctype/pos_opening_shift/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.js b/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.js
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.json b/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.py b/xpos/x_pos/doctype/pos_opening_shift/pos_opening_shift.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift/test_pos_opening_shift.py b/xpos/x_pos/doctype/pos_opening_shift/test_pos_opening_shift.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift_detail/__init__.py b/xpos/x_pos/doctype/pos_opening_shift_detail/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.json b/xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.py b/xpos/x_pos/doctype/pos_opening_shift_detail/pos_opening_shift_detail.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_payment_entry_reference/__init__.py b/xpos/x_pos/doctype/pos_payment_entry_reference/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.json b/xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.py b/xpos/x_pos/doctype/pos_payment_entry_reference/pos_payment_entry_reference.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_permission/__init__.py b/xpos/x_pos/doctype/pos_permission/__init__.py
new file mode 100755
index 0000000..e69de29
diff --git a/xpos/x_pos/doctype/pos_permission/pos_permission.js b/xpos/x_pos/doctype/pos_permission/pos_permission.js
new file mode 100755
index 0000000..79335d4
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_permission/pos_permission.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2026, Ali Raza and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("POS Permission", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/xpos/x_pos/doctype/pos_permission/pos_permission.json b/xpos/x_pos/doctype/pos_permission/pos_permission.json
new file mode 100755
index 0000000..2eb4fe5
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_permission/pos_permission.json
@@ -0,0 +1,67 @@
+{
+ "actions": [],
+ "autoname": "field:permission_name",
+ "creation": "2026-06-04 14:56:10.555707",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "permission_name",
+  "column_break_acbh",
+  "permission_label"
+ ],
+ "fields": [
+  {
+   "fieldname": "permission_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Permission Name",
+   "read_only": 1,
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "column_break_acbh",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "permission_label",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Permission Label",
+   "read_only": 1,
+   "reqd": 1
+  }
+ ],
+ "in_create": 1,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2026-06-04 15:34:55.405210",
+ "modified_by": "Administrator",
+ "module": "X POS",
+ "name": "POS Permission",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "read_only": 1,
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "permission_label",
+ "track_changes": 1
+}
diff --git a/xpos/x_pos/doctype/pos_permission/pos_permission.py b/xpos/x_pos/doctype/pos_permission/pos_permission.py
new file mode 100755
index 0000000..581447a
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_permission/pos_permission.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+from frappe.model.document import Document
+
+from xpos.api.auth import clear_role_permission_cache
+
+
+class POSPermission(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		permission_label: DF.Data
+		permission_name: DF.Data
+	# end: auto-generated types
+
+	def on_update(self):
+		# The catalog changed — every cached role map may be stale.
+		clear_role_permission_cache()
+
+	def on_trash(self):
+		clear_role_permission_cache()
diff --git a/xpos/x_pos/doctype/pos_permission/test_pos_permission.py b/xpos/x_pos/doctype/pos_permission/test_pos_permission.py
new file mode 100755
index 0000000..c1336bb
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_permission/test_pos_permission.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2026, Ali Raza and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+
+class IntegrationTestPOSPermission(IntegrationTestCase):
+	"""
+	Integration tests for POSPermission.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass
diff --git a/xpos/x_pos/doctype/pos_print_format_rule/__init__.py b/xpos/x_pos/doctype/pos_print_format_rule/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.json b/xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.py b/xpos/x_pos/doctype/pos_print_format_rule/pos_print_format_rule.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_purchase_taxes/__init__.py b/xpos/x_pos/doctype/pos_purchase_taxes/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.json b/xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.py b/xpos/x_pos/doctype/pos_purchase_taxes/pos_purchase_taxes.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_role/__init__.py b/xpos/x_pos/doctype/pos_role/__init__.py
new file mode 100755
index 0000000..e69de29
diff --git a/xpos/x_pos/doctype/pos_role/pos_role.js b/xpos/x_pos/doctype/pos_role/pos_role.js
new file mode 100755
index 0000000..1911826
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role/pos_role.js
@@ -0,0 +1,139 @@
+// Copyright (c) 2026, Ali Raza and contributors
+// For license information, please see license.txt
+//
+// Renders a grouped checkbox matrix into the `permissions_html` field, bound to
+// the `permissions` child table, and hides the raw child grid.
+
+const POS_PERMISSION_GROUPS = [
+	{
+		title: "Billing & Invoicing",
+		items: [
+			{ key: "close_bill", label: "Close Bill" },
+			{ key: "close_shift", label: "Close Shift" },
+			{ key: "allow_reprint_invoice", label: "Reprint Invoice" },
+			{ key: "shift_report", label: "Shift Report" },
+			{ key: "allow_cancel_invoice", label: "Cancel Invoice" },
+			{ key: "unsettled_invoices", label: "Unsettled Invoices" },
+		],
+	},
+	{
+		title: "Discounts & Pricing",
+		items: [
+			{ key: "apply_additional_discount", label: "Apply Additional Discount" },
+			{ key: "apply_standard_discount", label: "Apply Standard Discount" },
+			{ key: "show_edit_discount_field", label: "Edit Discount Field" },
+			{ key: "edit_tax_template", label: "Edit Tax Template" },
+			{ key: "allow_change_price", label: "Change Price" },
+		],
+	},
+	{
+		title: "Sales Operations",
+		items: [
+			{ key: "quotation", label: "Quotation" },
+			{ key: "sale_return", label: "Sale Return" },
+		],
+	},
+	{
+		title: "Purchasing & Stock",
+		items: [
+			{ key: "local_purchase", label: "Local Purchase" },
+			{ key: "purchase_order", label: "Purchase Order" },
+			{ key: "purchase_invoice", label: "Purchase Invoice" },
+			{ key: "stock_adjustment", label: "Stock Adjustment" },
+			{ key: "stock_entry", label: "Stock Entry" },
+			{ key: "near_expiry_items", label: "Near Expiry Items" },
+		],
+	},
+	{
+		title: "Cash Management",
+		items: [
+			{ key: "expense", label: "Expense" },
+			{ key: "bank_drop", label: "Bank Drop" },
+		],
+	},
+	{
+		title: "Lists",
+		items: [
+			{ key: "list_of_invoices", label: "List of Invoices" },
+			{ key: "list_of_cancelled_invoices", label: "List of Cancelled Invoices" },
+			{ key: "list_of_errors", label: "List of Errors" },
+			{ key: "list_of_purchase_invoices", label: "List of Purchase Invoices" },
+			{ key: "list_of_quotations", label: "List of Quotations" },
+			{ key: "list_of_stock_entries", label: "List of Stock Entries" },
+			{ key: "list_of_local_purchases", label: "List of Local Purchases" },
+			{ key: "list_of_stock_adjustments", label: "List of Stock Adjustments" },
+			{ key: "list_of_expense", label: "List of Expenses" },
+			{ key: "list_of_bank_drops", label: "List of Bank Drops" },
+		],
+	},
+	{
+		title: "Reports",
+		items: [
+			{ key: "invoice_settlement_report", label: "Invoice Settlement Report" },
+			{ key: "sales_report_by_time", label: "Sales Report by Time" },
+			{ key: "sales_summary_by_hour", label: "Sales Summary by Hour" },
+			{ key: "current_stock_by_brand", label: "Current Stock by Brand" },
+			{ key: "stock_register", label: "Stock Register" },
+			{ key: "current_stock_report", label: "Current Stock Report" },
+		],
+	},
+];
+
+frappe.ui.form.on("POS Role", {
+	refresh(frm) {
+		// The matrix is the editing surface — hide the raw child grid.
+		frm.set_df_property("permissions", "hidden", 1);
+		render_permission_matrix(frm);
+	},
+});
+
+function get_perm_row(frm, key) {
+	return (frm.doc.permissions || []).find((row) => row.permission === key);
+}
+
+function set_permission(frm, key, enabled) {
+	let row = get_perm_row(frm, key);
+	if (!row) {
+		row = frm.add_child("permissions", { permission: key, enabled: enabled ? 1 : 0 });
+	} else {
+		row.enabled = enabled ? 1 : 0;
+	}
+	frm.dirty();
+}
+
+function render_permission_matrix(frm) {
+	const wrapper = frm.get_field("permissions_html").$wrapper;
+	wrapper.empty();
+
+	const $container = $('<div class="pos-role-permissions"></div>');
+
+	POS_PERMISSION_GROUPS.forEach((group) => {
+		const $group = $(`
+			<div class="mb-4">
+				<div class="text-muted text-uppercase mb-2" style="font-size:11px;letter-spacing:.05em;">
+					${frappe.utils.escape_html(__(group.title))}
+				</div>
+			</div>
+		`);
+
+		group.items.forEach((item) => {
+			const row = get_perm_row(frm, item.key);
+			const checked = row && cint(row.enabled) ? "checked" : "";
+			const $item = $(`
+				<label class="d-flex align-items-center mb-1" style="gap:8px;cursor:pointer;">
+					<input type="checkbox" data-perm="${item.key}" ${checked}
+						style="width:14px;height:14px;cursor:pointer;" />
+					<span>${frappe.utils.escape_html(__(item.label))}</span>
+				</label>
+			`);
+			$item.find("input").on("change", function () {
+				set_permission(frm, item.key, this.checked);
+			});
+			$group.append($item);
+		});
+
+		$container.append($group);
+	});
+
+	wrapper.append($container);
+}
diff --git a/xpos/x_pos/doctype/pos_role/pos_role.json b/xpos/x_pos/doctype/pos_role/pos_role.json
new file mode 100755
index 0000000..a392bb9
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role/pos_role.json
@@ -0,0 +1,74 @@
+{
+ "actions": [],
+ "autoname": "field:role_name",
+ "creation": "2026-06-04 15:07:55.706446",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "role_name",
+  "section_break_vgze",
+  "permissions_html",
+  "section_break_chcf",
+  "permissions"
+ ],
+ "fields": [
+  {
+   "fieldname": "role_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Role Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "section_break_vgze",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "permissions_html",
+   "fieldtype": "HTML",
+   "label": "Permissions HTML"
+  },
+  {
+   "fieldname": "section_break_chcf",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "permissions",
+   "fieldtype": "Table",
+   "label": "Permissions",
+   "options": "POS Role Permission"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2026-06-04 15:30:11.437117",
+ "modified_by": "Administrator",
+ "module": "X POS",
+ "name": "POS Role",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "role_name",
+ "track_changes": 1
+}
diff --git a/xpos/x_pos/doctype/pos_role/pos_role.py b/xpos/x_pos/doctype/pos_role/pos_role.py
new file mode 100755
index 0000000..22e8be6
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role/pos_role.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+from xpos.api.auth import clear_role_permission_cache
+
+
+class POSRole(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+		from xpos.x_pos.doctype.pos_role_permission.pos_role_permission import POSRolePermission
+
+		permissions: DF.Table[POSRolePermission]
+		role_name: DF.Data
+	# end: auto-generated types
+
+	def validate(self):
+		self._sync_permissions_with_catalog()
+
+	def on_update(self):
+		clear_role_permission_cache(self.name)
+
+	def on_trash(self):
+		clear_role_permission_cache(self.name)
+
+	def _sync_permissions_with_catalog(self):
+		"""Keep the child table aligned with the POS Permission catalog.
+
+		Adds a disabled row for every catalog permission missing from this role
+		and drops rows whose permission no longer exists, preserving the enabled
+		flag of existing rows.
+		"""
+		catalog = set(frappe.get_all("POS Permission", pluck="name"))
+
+		kept = []
+		seen = set()
+		for row in self.permissions:
+			if row.permission in catalog and row.permission not in seen:
+				kept.append(row)
+				seen.add(row.permission)
+		self.set("permissions", kept)
+
+		for permission in catalog - seen:
+			self.append("permissions", {"permission": permission, "enabled": 0})
diff --git a/xpos/x_pos/doctype/pos_role/test_pos_role.py b/xpos/x_pos/doctype/pos_role/test_pos_role.py
new file mode 100755
index 0000000..708d162
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role/test_pos_role.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2026, Ali Raza and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+
+class IntegrationTestPOSRole(IntegrationTestCase):
+	"""
+	Integration tests for POSRole.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass
diff --git a/xpos/x_pos/doctype/pos_role_permission/__init__.py b/xpos/x_pos/doctype/pos_role_permission/__init__.py
new file mode 100755
index 0000000..e69de29
diff --git a/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.json b/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.json
new file mode 100755
index 0000000..0c181a5
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.json
@@ -0,0 +1,48 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-06-04 15:28:00.546961",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "permission",
+  "column_break_qopc",
+  "enabled"
+ ],
+ "fields": [
+  {
+   "fieldname": "permission",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Permission",
+   "options": "POS Permission"
+  },
+  {
+   "fieldname": "column_break_qopc",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Enabled"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-06-04 15:30:44.732969",
+ "modified_by": "Administrator",
+ "module": "X POS",
+ "name": "POS Role Permission",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.py b/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.py
new file mode 100755
index 0000000..96a8968
--- /dev/null
+++ b/xpos/x_pos/doctype/pos_role_permission/pos_role_permission.py
@@ -0,0 +1,24 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class POSRolePermission(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		enabled: DF.Check
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+		permission: DF.Link | None
+	# end: auto-generated types
+
+	pass
diff --git a/xpos/x_pos/doctype/pos_sales_person_filter/__init__.py b/xpos/x_pos/doctype/pos_sales_person_filter/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.json b/xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.py b/xpos/x_pos/doctype/pos_sales_person_filter/pos_sales_person_filter.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/integrations/__init__.py b/xpos/x_pos/integrations/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/integrations/fbr.py b/xpos/x_pos/integrations/fbr.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/report/pos_shift_reconciliation/__init__.py b/xpos/x_pos/report/pos_shift_reconciliation/__init__.py
new file mode 100755
index 0000000..e69de29
diff --git a/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.js b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.js
new file mode 100755
index 0000000..43c2b8d
--- /dev/null
+++ b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.js
@@ -0,0 +1,38 @@
+// Copyright (c) 2026, Ali Raza and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["POS Shift Reconciliation"] = {
+	filters: [
+		{
+			fieldname: "pos_opening_shift",
+			label: __("Opening Shift"),
+			fieldtype: "Link",
+			options: "POS Opening Shift",
+		},
+		{
+			fieldname: "company",
+			label: __("Company"),
+			fieldtype: "Link",
+			options: "Company",
+			default: frappe.defaults.get_default("company"),
+		},
+		{
+			fieldname: "pos_profile",
+			label: __("POS Profile"),
+			fieldtype: "Link",
+			options: "POS Profile",
+		},
+		{
+			fieldname: "from_date",
+			label: __("From Date"),
+			fieldtype: "Date",
+			default: frappe.datetime.get_today(),
+		},
+		{
+			fieldname: "to_date",
+			label: __("To Date"),
+			fieldtype: "Date",
+			default: frappe.datetime.get_today(),
+		},
+	],
+};
diff --git a/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.json b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.json
new file mode 100755
index 0000000..fe27851
--- /dev/null
+++ b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.json
@@ -0,0 +1,34 @@
+{
+ "add_total_row": 1,
+ "add_translate_data": 0,
+ "columns": [],
+ "creation": "2026-06-03 00:00:00.000000",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "letter_head": null,
+ "modified": "2026-06-03 00:00:00.000000",
+ "modified_by": "Administrator",
+ "module": "X POS",
+ "name": "POS Shift Reconciliation",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "POS Opening Shift",
+ "report_name": "POS Shift Reconciliation",
+ "report_type": "Script Report",
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "Sales Manager"
+  },
+  {
+   "role": "Sales User"
+  }
+ ],
+ "timeout": 0
+}
diff --git a/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.py b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.py
new file mode 100755
index 0000000..3f83043
--- /dev/null
+++ b/xpos/x_pos/report/pos_shift_reconciliation/pos_shift_reconciliation.py
@@ -0,0 +1,140 @@
+# Copyright (c) 2026, Ali Raza and contributors
+# For license information, please see license.txt
+
+"""Per-shift reconciliation (Z-report).
+
+Returns the items sold during a POS shift (qty + amount) as the main table, and
+the totals by payment mode (plus headline figures) as the report summary, so a
+supervisor can reconcile the till at end of shift.
+"""
+
+import frappe
+from frappe import _
+from frappe.utils import flt
+
+from xpos.api.utilities import get_invoice_type
+
+
+def execute(filters=None):
+	filters = frappe.parse_json(filters) if filters else {}
+	doctype = get_invoice_type()
+	invoices = _get_invoices(filters, doctype)
+	return get_columns(), _get_items_sold(invoices, doctype), None, None, _get_report_summary(invoices, doctype)
+
+
+def _get_invoices(filters, doctype):
+	conditions = {"docstatus": 1, "is_pos": 1}
+	if doctype == "POS Invoice":
+		conditions["consolidated_invoice"] = ["in", ["", None]]
+
+	if filters.get("pos_opening_shift"):
+		conditions["pos_opening_shift"] = filters["pos_opening_shift"]
+	else:
+		if filters.get("company"):
+			conditions["company"] = filters["company"]
+		if filters.get("pos_profile"):
+			conditions["pos_profile"] = filters["pos_profile"]
+		if filters.get("from_date") and filters.get("to_date"):
+			conditions["posting_date"] = ["between", [filters["from_date"], filters["to_date"]]]
+
+	return frappe.get_all(
+		doctype,
+		filters=conditions,
+		fields=["name", "grand_total", "net_total", "change_amount", "is_return"],
+	)
+
+
+def _get_items_sold(invoices, doctype):
+	names = [inv["name"] for inv in invoices]
+	if not names:
+		return []
+
+	item_table = f"`tab{doctype} Item`"
+	return frappe.db.sql(
+		f"""
+		SELECT
+			item_code,
+			item_name,
+			uom,
+			ROUND(SUM(qty), 3) AS qty,
+			ROUND(SUM(amount), 2) AS amount
+		FROM {item_table}
+		WHERE parent IN %(names)s AND parenttype = %(dt)s
+		GROUP BY item_code
+		ORDER BY item_name ASC
+		""",
+		{"names": names, "dt": doctype},
+		as_dict=True,
+	)
+
+
+def _get_report_summary(invoices, doctype):
+	# Totals by payment mode, mirroring xpos.api.shifts.get_shift_summary so the
+	# report and the closing dialog always agree (change is distributed across
+	# the modes used on each invoice).
+	payment_summary = {}
+	for inv in invoices:
+		payments = frappe.get_all(
+			"Sales Invoice Payment",
+			filters={"parent": inv["name"], "parenttype": doctype},
+			fields=["mode_of_payment", "amount"],
+		)
+		inv_change = flt(inv.get("change_amount"))
+		inv_paid = sum(flt(p["amount"]) for p in payments)
+		for p in payments:
+			pay_amount = flt(p["amount"])
+			if inv_paid > 0 and inv_change > 0:
+				pay_amount -= pay_amount / inv_paid * inv_change
+			mode = p["mode_of_payment"]
+			payment_summary[mode] = payment_summary.get(mode, 0) + pay_amount
+
+	grand_total = sum(flt(inv.get("grand_total")) for inv in invoices)
+	returns_count = sum(1 for inv in invoices if inv.get("is_return"))
+
+	summary = [
+		{"label": _("Total Invoices"), "value": len(invoices), "indicator": "Blue"},
+		{"label": _("Returns"), "value": returns_count, "indicator": "Red" if returns_count else "Grey"},
+		{"label": _("Grand Total"), "value": flt(grand_total, 2), "datatype": "Currency", "indicator": "Green"},
+	]
+	for mode, amount in sorted(payment_summary.items()):
+		summary.append(
+			{"label": mode, "value": flt(amount, 2), "datatype": "Currency", "indicator": "Green"}
+		)
+	return summary
+
+
+def get_columns():
+	return [
+		{
+			"label": _("Item Code"),
+			"fieldname": "item_code",
+			"fieldtype": "Link",
+			"options": "Item",
+			"width": 180,
+		},
+		{
+			"label": _("Item Name"),
+			"fieldname": "item_name",
+			"fieldtype": "Data",
+			"width": 260,
+		},
+		{
+			"label": _("UOM"),
+			"fieldname": "uom",
+			"fieldtype": "Link",
+			"options": "UOM",
+			"width": 90,
+		},
+		{
+			"label": _("Qty Sold"),
+			"fieldname": "qty",
+			"fieldtype": "Float",
+			"width": 110,
+		},
+		{
+			"label": _("Amount"),
+			"fieldname": "amount",
+			"fieldtype": "Currency",
+			"width": 140,
+		},
+	]
diff --git a/xpos/x_pos/report/stock_audit_report/__init__.py b/xpos/x_pos/report/stock_audit_report/__init__.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/report/stock_audit_report/stock_audit_report.js b/xpos/x_pos/report/stock_audit_report/stock_audit_report.js
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/report/stock_audit_report/stock_audit_report.json b/xpos/x_pos/report/stock_audit_report/stock_audit_report.json
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/report/stock_audit_report/stock_audit_report.py b/xpos/x_pos/report/stock_audit_report/stock_audit_report.py
old mode 100644
new mode 100755
diff --git a/xpos/x_pos/workspace/x_pos/x_pos.json b/xpos/x_pos/workspace/x_pos/x_pos.json
index c9f81ad..ddd737f 100755
--- a/xpos/x_pos/workspace/x_pos/x_pos.json
+++ b/xpos/x_pos/workspace/x_pos/x_pos.json
@@ -1,6 +1,7 @@
 {
+ "app": "xpos",
  "charts": [],
- "content": "[{\"id\":\"xpos_header\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">X POS</span>\",\"col\":12}},{\"id\":\"xpos_shortcut\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"X POS App\",\"col\":3}},{\"id\":\"bExEIm8hyI\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"id\":\"trazJ5ah1v\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Invoice\",\"col\":3}},{\"id\":\"xpos_spacer\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"1adNPVupDN\",\"type\":\"card\",\"data\":{\"card_name\":\"Setup\",\"col\":4}},{\"id\":\"kCl3eJ9h7e\",\"type\":\"card\",\"data\":{\"card_name\":\"Offers & Coupons\",\"col\":4}},{\"id\":\"UgL618YZqd\",\"type\":\"card\",\"data\":{\"card_name\":\"Cash Movement\",\"col\":4}}]",
+ "content": "[{\"id\":\"xpos_header\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">X POS</span>\",\"col\":12}},{\"id\":\"xpos_shortcut\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"X POS App\",\"col\":3}},{\"id\":\"bExEIm8hyI\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"id\":\"trazJ5ah1v\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pos Invoice\",\"col\":3}},{\"id\":\"xpos_spacer\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"1adNPVupDN\",\"type\":\"card\",\"data\":{\"card_name\":\"Setup\",\"col\":4}},{\"id\":\"kCl3eJ9h7e\",\"type\":\"card\",\"data\":{\"card_name\":\"Offers & Coupons\",\"col\":4}},{\"id\":\"UgL618YZqd\",\"type\":\"card\",\"data\":{\"card_name\":\"Cash Movement\",\"col\":4}},{\"id\":\"3-RdUJ4vti\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
  "creation": "2026-02-27 00:00:00",
  "custom_blocks": [],
  "docstatus": 0,
@@ -80,11 +81,194 @@
    "onboard": 0,
    "type": "Link"
   },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Reports",
+   "link_count": 16,
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Card Break"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 1,
+   "label": "POS Shift Reconciliation",
+   "link_count": 0,
+   "link_to": "POS Shift Reconciliation",
+   "link_type": "Report",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 1,
+   "label": "Branch Item Summary",
+   "link_count": 0,
+   "link_to": "Branch Item Summary",
+   "link_type": "Report",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Branch Set Summary",
+   "link_count": 0,
+   "link_to": "Branch Set Summary",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Stock Entry",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Current Stock By Brand",
+   "link_count": 0,
+   "link_to": "Current Stock By Brand",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Item",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Current Stock Report",
+   "link_count": 0,
+   "link_to": "Current Stock Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Item",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Current Stock Summary",
+   "link_count": 0,
+   "link_to": "Current Stock Summary",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Item",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Current Stock with Levels",
+   "link_count": 0,
+   "link_to": "Current Stock with Levels",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Bin",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Dead Stock Report",
+   "link_count": 0,
+   "link_to": "Dead Stock Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Stock Ledger Entry",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Low Qty Sales Report",
+   "link_count": 0,
+   "link_to": "Low Qty Sales Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Sales Invoice",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Purchase Order Report",
+   "link_count": 0,
+   "link_to": "Purchase Order Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Bin",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Slow Fast Moving Items",
+   "link_count": 0,
+   "link_to": "Slow Fast Moving Items",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Sales Invoice",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Stock Audit Report",
+   "link_count": 0,
+   "link_to": "Stock Audit Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Item",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Stock Value by Warehouse",
+   "link_count": 0,
+   "link_to": "Stock Value by Warehouse",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Bin",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Stock Value Summary by Date",
+   "link_count": 0,
+   "link_to": "Stock Value Summary by Date",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Stock Ledger Entry",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Warehouse Stock Movement",
+   "link_count": 0,
+   "link_to": "Warehouse Stock Movement",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Stock Ledger Entry",
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Zero Qty Sales Report",
+   "link_count": 0,
+   "link_to": "Zero Qty Sales Report",
+   "link_type": "Report",
+   "onboard": 0,
+   "report_ref_doctype": "Sales Invoice",
+   "type": "Link"
+  },
   {
    "hidden": 0,
    "is_query_report": 0,
    "label": "Setup",
-   "link_count": 5,
+   "link_count": 7,
    "link_type": "DocType",
    "onboard": 0,
    "type": "Card Break"
@@ -92,9 +276,9 @@
   {
    "hidden": 0,
    "is_query_report": 0,
-   "label": "POS Profile",
+   "label": "Delivery Charges",
    "link_count": 0,
-   "link_to": "POS Profile",
+   "link_to": "Delivery Charges",
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
@@ -102,9 +286,9 @@
   {
    "hidden": 0,
    "is_query_report": 0,
-   "label": "Scale Barcode Settings",
+   "label": "POS Closing Shift",
    "link_count": 0,
-   "link_to": "Scale Barcode Settings",
+   "link_to": "POS Closing Shift",
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
@@ -122,9 +306,9 @@
   {
    "hidden": 0,
    "is_query_report": 0,
-   "label": "POS Closing Shift",
+   "label": "POS Permission",
    "link_count": 0,
-   "link_to": "POS Closing Shift",
+   "link_to": "POS Permission",
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
@@ -132,15 +316,35 @@
   {
    "hidden": 0,
    "is_query_report": 0,
-   "label": "Delivery Charges",
+   "label": "POS Profile",
    "link_count": 0,
-   "link_to": "Delivery Charges",
+   "link_to": "POS Profile",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "POS Role",
+   "link_count": 0,
+   "link_to": "POS Role",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Scale Barcode Settings",
+   "link_count": 0,
+   "link_to": "Scale Barcode Settings",
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
   }
  ],
- "modified": "2026-04-08 17:25:36.344674",
+ "modified": "2026-06-04 15:26:50.429253",
  "modified_by": "Administrator",
  "module": "X POS",
  "name": "X POS",
@@ -177,5 +381,6 @@
    "type": "DocType"
   }
  ],
- "title": "X POS"
-}
\ No newline at end of file
+ "title": "X POS",
+ "type": "Workspace"
+}

From c76d96646c28df3caa6c4dabd62991609ba459ac Mon Sep 17 00:00:00 2001
From: Ali Raza <soundsofnation29@gmail.com>
Date: Fri, 5 Jun 2026 12:05:03 +0500
Subject: [PATCH 3/5] refactor: remove unused permissions and related code from
 POS profile

- Removed allow_rate_change, allow_discount_change, allow_print_last_invoice, and allow_print_draft_invoices from posStore and POSProfile type definitions.
- Updated RolePermissionsView to reflect the removal of certain permissions.
- Adjusted auth.py to remove unused permission keys.
- Modified invoices.py and shifts.py to utilize new permission checks for printing draft invoices.
- Cleaned up install.py by removing deprecated permissions and adjusting default role settings.
- Updated pos_profile.json to remove fields related to removed permissions and added new fields for cashier settlement and backup receipt printing.
- Updated pos_profile_user.json to reflect recent changes in the system.
---
 frontend/src/components/MenuBar.vue           |   1 +
 frontend/src/components/Navbar.vue            |   8 +-
 frontend/src/components/cart/CartItem.vue     |   7 +-
 frontend/src/components/cart/CartSummary.vue  |   3 +-
 .../components/dialogs/ItemDetailDialog.vue   |   3 +-
 .../src/components/dialogs/PaymentDialog.vue  |  48 +-
 frontend/src/services/userRights.ts           |  54 +-
 frontend/src/stores/posStore.ts               |  17 -
 frontend/src/types/pos.types.ts               |   5 -
 frontend/src/views/RolePermissionsView.vue    |  41 +-
 xpos/api/auth.py                              |  27 +-
 xpos/api/invoices.py                          |   6 +-
 xpos/api/shifts.py                            |   6 +-
 xpos/install.py                               |  35 +-
 xpos/x_pos/custom/pos_profile.json            | 514 ++++++------------
 xpos/x_pos/custom/pos_profile_user.json       |   2 +-
 16 files changed, 216 insertions(+), 561 deletions(-)

diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index 674d2f4..96a61b6 100755
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -364,6 +364,7 @@ const menus = computed<Menu[]>(() => [
 				label: "Return Invoice",
 				icon: RotateCcw,
 				shortcut: "Ctrl+R",
+				hidden: () => !hasPermission("sale_return"),
 				disabled: () => !posStore.allowReturn,
 				action: () => {
 					window.dispatchEvent(new CustomEvent("xpos:show-return-dialog"));
diff --git a/frontend/src/components/Navbar.vue b/frontend/src/components/Navbar.vue
index a37d928..d292949 100755
--- a/frontend/src/components/Navbar.vue
+++ b/frontend/src/components/Navbar.vue
@@ -95,7 +95,7 @@
 			</Button>
 		</TooltipWrapper>
 
-		<TooltipWrapper v-if="posStore.allowReturn" :content="__('Process Return')">
+		<TooltipWrapper v-if="posStore.allowReturn && hasPermission('sale_return')" :content="__('Process Return')">
 			<Button
 				variant="ghost"
 				size="sm"
@@ -108,7 +108,7 @@
 		</TooltipWrapper>
 
 		<TooltipWrapper
-			v-if="posStore.allowPrintLastInvoice && posStore.lastInvoiceName && hasPermission('allow_reprint_invoice')"
+			v-if="posStore.lastInvoiceName && hasPermission('allow_reprint_invoice')"
 			:content="__('Print Last Invoice')"
 		>
 			<Button
@@ -334,7 +334,7 @@ function handleShowRepeatDialog() {
 }
 
 function handleShowReturnDialog() {
-	if (!posStore.allowReturn) return;
+	if (!posStore.allowReturn || !hasPermission("sale_return")) return;
 	showReturnDialog.value = true;
 }
 
@@ -345,7 +345,7 @@ function handleKeyboard(e: KeyboardEvent) {
 	}
 	if (e.ctrlKey && !e.shiftKey && e.key.toLowerCase() === "r") {
 		e.preventDefault();
-		if (posStore.allowReturn) showReturnDialog.value = true;
+		if (posStore.allowReturn && hasPermission("sale_return")) showReturnDialog.value = true;
 	}
 }
 
diff --git a/frontend/src/components/cart/CartItem.vue b/frontend/src/components/cart/CartItem.vue
index daa3c70..48aa675 100755
--- a/frontend/src/components/cart/CartItem.vue
+++ b/frontend/src/components/cart/CartItem.vue
@@ -29,7 +29,7 @@
 			</p>
 
 			<div class="flex items-center gap-1 mt-0.5 flex-wrap">
-				<template v-if="posStore.allowEditRate">
+				<template v-if="hasPermission('allow_change_price')">
 					<span class="text-[11px] text-muted-foreground">{{ currencySymbol }}</span>
 					<input
 						ref="rateInput"
@@ -127,7 +127,7 @@
 					<Plus class="w-2.5 h-2.5" />
 				</Button>
 
-				<template v-if="posStore.allowEditItemDiscount">
+				<template v-if="hasPermission('show_edit_discount_field')">
 					<button
 						@click="showDiscountInput = !showDiscountInput"
 						class="ms-1 px-1.5 py-0.5 rounded text-[10px] font-medium transition-all"
@@ -144,7 +144,7 @@
 			</div>
 
 			<div
-				v-if="showDiscountInput && posStore.allowEditItemDiscount"
+				v-if="showDiscountInput && hasPermission('show_edit_discount_field')"
 				class="mt-1.5 p-2 bg-emerald-50 dark:bg-emerald-900/20 rounded-md border border-emerald-200 dark:border-emerald-800"
 			>
 				<div class="flex items-center gap-2">
@@ -208,6 +208,7 @@
 <script setup lang="ts">
 import { ref, computed, watch, onMounted, nextTick } from "vue";
 import { usePosStore } from "@/stores/posStore";
+import { hasPermission } from "@/services/userRights";
 import { useCartStore } from "@/stores/cartStore";
 import { useItemStore } from "@/stores/itemStore";
 import { Button } from "@/components/ui/button";
diff --git a/frontend/src/components/cart/CartSummary.vue b/frontend/src/components/cart/CartSummary.vue
index 4e21f94..54fc449 100755
--- a/frontend/src/components/cart/CartSummary.vue
+++ b/frontend/src/components/cart/CartSummary.vue
@@ -139,7 +139,7 @@
 		<div class="flex gap-2">
 			<TooltipWrapper :content="__('Additional Discount')">
 				<Button
-					v-if="posStore.allowEditAdditionalDiscount"
+					v-if="hasPermission('apply_additional_discount')"
 					variant="outline"
 					size="sm"
 					:class="{
@@ -343,6 +343,7 @@
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
 import { usePosStore } from "@/stores/posStore";
+import { hasPermission } from "@/services/userRights";
 import { useCartStore } from "@/stores/cartStore";
 import { useOfferStore } from "@/stores/offerStore";
 import { call, showSuccess, showError } from "@/services/api";
diff --git a/frontend/src/components/dialogs/ItemDetailDialog.vue b/frontend/src/components/dialogs/ItemDetailDialog.vue
index fdbacbc..f09453b 100755
--- a/frontend/src/components/dialogs/ItemDetailDialog.vue
+++ b/frontend/src/components/dialogs/ItemDetailDialog.vue
@@ -65,7 +65,7 @@
 							{{ __("Price") }}
 						</label>
 						<NumberInput
-							v-if="posStore.allowEditRate"
+							v-if="hasPermission('allow_change_price')"
 							v-model="priceInput"
 							:min="0"
 							:precision="2"
@@ -192,6 +192,7 @@ import { ref, computed, watch, nextTick } from "vue";
 import { useItemStore } from "@/stores/itemStore";
 import { useCartStore } from "@/stores/cartStore";
 import { usePosStore } from "@/stores/posStore";
+import { hasPermission } from "@/services/userRights";
 import { showError } from "@/services/api";
 import {
 	Dialog,
diff --git a/frontend/src/components/dialogs/PaymentDialog.vue b/frontend/src/components/dialogs/PaymentDialog.vue
index 21bf198..cc56be3 100755
--- a/frontend/src/components/dialogs/PaymentDialog.vue
+++ b/frontend/src/components/dialogs/PaymentDialog.vue
@@ -407,30 +407,6 @@
 						/>
 					</div>
 
-					<div class="space-y-1">
-						<div class="flex items-center justify-between">
-							<label
-								class="text-xs font-semibold text-muted-foreground uppercase tracking-wider"
-							>
-								{{ __("Posting Date") }}
-							</label>
-							<span
-								v-if="!posStore.allowChangePostingDate"
-								class="text-xs text-muted-foreground"
-							>
-								{{ __("Locked by POS Profile") }}
-							</span>
-						</div>
-						<DateTimePicker
-							v-model="cartStore.postingDate"
-							mode="date"
-							:disabled="!posStore.allowChangePostingDate"
-							:clearable="false"
-							placeholder="Posting date"
-							class="text-sm"
-						/>
-					</div>
-
 					<div class="flex gap-2 mt-auto">
 						<div
 							v-if="changeAmount > 0"
@@ -463,6 +439,30 @@
 							</p>
 						</div>
 					</div>
+
+					<div class="space-y-1">
+						<div class="flex items-center justify-between">
+							<label
+								class="text-xs font-semibold text-muted-foreground uppercase tracking-wider"
+							>
+								{{ __("Posting Date") }}
+							</label>
+							<span
+								v-if="!posStore.allowChangePostingDate"
+								class="text-xs text-muted-foreground"
+							>
+								{{ __("Locked by POS Profile") }}
+							</span>
+						</div>
+						<DateTimePicker
+							v-model="cartStore.postingDate"
+							mode="date"
+							:disabled="!posStore.allowChangePostingDate"
+							:clearable="false"
+							placeholder="Posting date"
+							class="text-sm"
+						/>
+					</div>
 				</div>
 
 				<div class="hidden lg:flex flex-col w-64 border-s border-border p-4 gap-3">
diff --git a/frontend/src/services/userRights.ts b/frontend/src/services/userRights.ts
index d877edd..0943bb7 100755
--- a/frontend/src/services/userRights.ts
+++ b/frontend/src/services/userRights.ts
@@ -3,82 +3,32 @@ import { isElectron } from "./electronBridge";
 import { call } from "./api";
 
 export interface PosPermissions {
-  close_bill: boolean;
   close_shift: boolean;
   allow_reprint_invoice: boolean;
+  print_draft_invoice: boolean;
   shift_report: boolean;
-  allow_cancel_invoice: boolean;
-  unsettled_invoices: boolean;
   apply_additional_discount: boolean;
-  apply_standard_discount: boolean;
   show_edit_discount_field: boolean;
-  edit_tax_template: boolean;
   allow_change_price: boolean;
-  quotation: boolean;
   sale_return: boolean;
-  local_purchase: boolean;
-  purchase_order: boolean;
-  purchase_invoice: boolean;
-  stock_adjustment: boolean;
-  stock_entry: boolean;
-  near_expiry_items: boolean;
   expense: boolean;
   bank_drop: boolean;
-  list_of_invoices: boolean;
-  list_of_cancelled_invoices: boolean;
-  list_of_errors: boolean;
-  list_of_purchase_invoices: boolean;
-  list_of_quotations: boolean;
-  list_of_stock_entries: boolean;
-  list_of_local_purchases: boolean;
-  list_of_stock_adjustments: boolean;
-  list_of_expense: boolean;
-  list_of_bank_drops: boolean;
-  invoice_settlement_report: boolean;
-  sales_report_by_time: boolean;
-  sales_summary_by_hour: boolean;
   current_stock_by_brand: boolean;
-  stock_register: boolean;
   current_stock_report: boolean;
 }
 
 const DEFAULT_PERMISSIONS: PosPermissions = {
-  close_bill: true,
   close_shift: false,
   allow_reprint_invoice: false,
+  print_draft_invoice: false,
   shift_report: false,
-  allow_cancel_invoice: false,
-  unsettled_invoices: false,
   apply_additional_discount: false,
-  apply_standard_discount: false,
   show_edit_discount_field: false,
-  edit_tax_template: false,
   allow_change_price: false,
-  quotation: false,
   sale_return: false,
-  local_purchase: false,
-  purchase_order: false,
-  purchase_invoice: false,
-  stock_adjustment: false,
-  stock_entry: false,
-  near_expiry_items: false,
   expense: false,
   bank_drop: false,
-  list_of_invoices: true,
-  list_of_cancelled_invoices: false,
-  list_of_errors: false,
-  list_of_purchase_invoices: false,
-  list_of_quotations: false,
-  list_of_stock_entries: false,
-  list_of_local_purchases: false,
-  list_of_stock_adjustments: false,
-  list_of_expense: false,
-  list_of_bank_drops: false,
-  invoice_settlement_report: false,
-  sales_report_by_time: false,
-  sales_summary_by_hour: false,
   current_stock_by_brand: false,
-  stock_register: false,
   current_stock_report: false,
 };
 
diff --git a/frontend/src/stores/posStore.ts b/frontend/src/stores/posStore.ts
index c35d21b..5112289 100755
--- a/frontend/src/stores/posStore.ts
+++ b/frontend/src/stores/posStore.ts
@@ -82,8 +82,6 @@ export const usePosStore = defineStore("pos", () => {
 
 	const defaultCustomer = computed(() => posProfile.value?.customer || "");
 
-	const allowEditRate = computed(() => !!posProfile.value?.allow_rate_change);
-
 	const hideImages = computed(() => !!posProfile.value?.hide_images);
 
 	const hideUnavailableItems = computed(() => !!posProfile.value?.hide_unavailable_items);
@@ -100,12 +98,6 @@ export const usePosStore = defineStore("pos", () => {
 
 	const useOfflineMode = computed(() => !!posProfile.value?.use_offline_mode);
 
-	const allowEditItemDiscount = computed(() => !!posProfile.value?.allow_discount_change);
-
-	const allowEditAdditionalDiscount = computed(
-		() => !!posProfile.value?.allow_user_to_edit_additional_discount,
-	);
-
 	const allowChangePostingDate = computed(() => !!posProfile.value?.allow_change_posting_date);
 
 	const displayItemsInStock = computed(() => !!posProfile.value?.display_items_in_stock);
@@ -122,8 +114,6 @@ export const usePosStore = defineStore("pos", () => {
 
 	const allowDeleteOfflineInvoice = computed(() => !!posProfile.value?.allow_delete_offline_invoice);
 
-	const allowPrintLastInvoice = computed(() => !!posProfile.value?.allow_print_last_invoice);
-
 	const displayAdditionalNotes = computed(() => !!posProfile.value?.display_additional_notes);
 
 	const allowWriteOffChange = computed(() => !!posProfile.value?.allow_write_off_change);
@@ -164,8 +154,6 @@ export const usePosStore = defineStore("pos", () => {
 
 	const applyCustomerDiscount = computed(() => !!posProfile.value?.apply_customer_discount);
 
-	const allowPrintDraftInvoices = computed(() => !!posProfile.value?.allow_print_draft_invoices);
-
 	const enableCashierSettlement = computed(() => !!posProfile.value?.enable_cashier_settlement);
 
 	const printBackupReceipt = computed(() => !!posProfile.value?.print_backup_receipt);
@@ -506,9 +494,6 @@ export const usePosStore = defineStore("pos", () => {
 		companyName,
 		sellingPriceList,
 		defaultCustomer,
-		allowEditRate,
-		allowEditItemDiscount,
-		allowEditAdditionalDiscount,
 		allowChangePostingDate,
 		displayItemsInStock,
 		allowPartialPayment,
@@ -517,7 +502,6 @@ export const usePosStore = defineStore("pos", () => {
 		allowReturnWithoutInvoice,
 		allowSalesOrder,
 		allowDeleteOfflineInvoice,
-		allowPrintLastInvoice,
 		displayAdditionalNotes,
 		allowWriteOffChange,
 		displayItemCode,
@@ -538,7 +522,6 @@ export const usePosStore = defineStore("pos", () => {
 		returnValidityDays,
 		useCustomerCredit,
 		applyCustomerDiscount,
-		allowPrintDraftInvoices,
 		enableCashierSettlement,
 		printBackupReceipt,
 		cashModeOfPayment,
diff --git a/frontend/src/types/pos.types.ts b/frontend/src/types/pos.types.ts
index eaebaae..6da2c14 100755
--- a/frontend/src/types/pos.types.ts
+++ b/frontend/src/types/pos.types.ts
@@ -29,10 +29,7 @@ export interface POSProfile {
 	write_off_cost_center?: string;
 	selling_price_list?: string;
 	default_customer?: string;
-	allow_rate_change?: boolean;
 	allow_change_posting_date?: boolean;
-	allow_user_to_edit_additional_discount?: boolean;
-	allow_discount_change?: boolean;
 	display_items_in_stock?: boolean;
 	allow_partial_payment?: boolean;
 	allow_credit_sale?: boolean;
@@ -40,13 +37,11 @@ export interface POSProfile {
 	allow_return_without_invoice?: boolean;
 	allow_sales_order?: boolean;
 	allow_delete_offline_invoice?: boolean;
-	allow_print_last_invoice?: boolean;
 	display_additional_notes?: boolean;
 	allow_write_off_change?: boolean;
 	input_qty?: boolean;
 	display_item_code?: boolean;
 	allow_zero_rated_items?: boolean;
-	allow_print_draft_invoices?: boolean;
 	enable_cashier_settlement?: boolean;
 	print_backup_receipt?: boolean;
 	auto_set_batch?: boolean;
diff --git a/frontend/src/views/RolePermissionsView.vue b/frontend/src/views/RolePermissionsView.vue
index ab9ed8d..c309980 100755
--- a/frontend/src/views/RolePermissionsView.vue
+++ b/frontend/src/views/RolePermissionsView.vue
@@ -104,41 +104,23 @@ const PERMISSION_GROUPS: { title: string; items: { key: string; label: string }[
 	{
 		title: "Billing & Invoicing",
 		items: [
-			{ key: "close_bill", label: "Close Bill" },
 			{ key: "close_shift", label: "Close Shift" },
 			{ key: "allow_reprint_invoice", label: "Reprint Invoice" },
+			{ key: "print_draft_invoice", label: "Print Draft Invoice" },
 			{ key: "shift_report", label: "Shift Report" },
-			{ key: "allow_cancel_invoice", label: "Cancel Invoice" },
-			{ key: "unsettled_invoices", label: "Unsettled Invoices" },
 		],
 	},
 	{
 		title: "Discounts & Pricing",
 		items: [
 			{ key: "apply_additional_discount", label: "Apply Additional Discount" },
-			{ key: "apply_standard_discount", label: "Apply Standard Discount" },
 			{ key: "show_edit_discount_field", label: "Edit Discount Field" },
-			{ key: "edit_tax_template", label: "Edit Tax Template" },
 			{ key: "allow_change_price", label: "Change Price" },
 		],
 	},
 	{
 		title: "Sales Operations",
-		items: [
-			{ key: "quotation", label: "Quotation" },
-			{ key: "sale_return", label: "Sale Return" },
-		],
-	},
-	{
-		title: "Purchasing & Stock",
-		items: [
-			{ key: "local_purchase", label: "Local Purchase" },
-			{ key: "purchase_order", label: "Purchase Order" },
-			{ key: "purchase_invoice", label: "Purchase Invoice" },
-			{ key: "stock_adjustment", label: "Stock Adjustment" },
-			{ key: "stock_entry", label: "Stock Entry" },
-			{ key: "near_expiry_items", label: "Near Expiry Items" },
-		],
+		items: [{ key: "sale_return", label: "Sale Return" }],
 	},
 	{
 		title: "Cash Management",
@@ -147,29 +129,10 @@ const PERMISSION_GROUPS: { title: string; items: { key: string; label: string }[
 			{ key: "bank_drop", label: "Bank Drop" },
 		],
 	},
-	{
-		title: "Lists",
-		items: [
-			{ key: "list_of_invoices", label: "List of Invoices" },
-			{ key: "list_of_cancelled_invoices", label: "List of Cancelled Invoices" },
-			{ key: "list_of_errors", label: "List of Errors" },
-			{ key: "list_of_purchase_invoices", label: "List of Purchase Invoices" },
-			{ key: "list_of_quotations", label: "List of Quotations" },
-			{ key: "list_of_stock_entries", label: "List of Stock Entries" },
-			{ key: "list_of_local_purchases", label: "List of Local Purchases" },
-			{ key: "list_of_stock_adjustments", label: "List of Stock Adjustments" },
-			{ key: "list_of_expense", label: "List of Expenses" },
-			{ key: "list_of_bank_drops", label: "List of Bank Drops" },
-		],
-	},
 	{
 		title: "Reports",
 		items: [
-			{ key: "invoice_settlement_report", label: "Invoice Settlement Report" },
-			{ key: "sales_report_by_time", label: "Sales Report by Time" },
-			{ key: "sales_summary_by_hour", label: "Sales Summary by Hour" },
 			{ key: "current_stock_by_brand", label: "Current Stock by Brand" },
-			{ key: "stock_register", label: "Stock Register" },
 			{ key: "current_stock_report", label: "Current Stock Report" },
 		],
 	},
diff --git a/xpos/api/auth.py b/xpos/api/auth.py
index 35884da..9fb6d5f 100755
--- a/xpos/api/auth.py
+++ b/xpos/api/auth.py
@@ -7,42 +7,17 @@
 from frappe.utils import cint, flt
 
 ALL_PERMISSION_KEYS = (
-	"close_bill",
 	"close_shift",
 	"allow_reprint_invoice",
+	"print_draft_invoice",
 	"shift_report",
-	"allow_cancel_invoice",
-	"unsettled_invoices",
 	"apply_additional_discount",
-	"apply_standard_discount",
 	"show_edit_discount_field",
-	"edit_tax_template",
 	"allow_change_price",
-	"quotation",
 	"sale_return",
-	"local_purchase",
-	"purchase_order",
-	"purchase_invoice",
-	"stock_adjustment",
-	"stock_entry",
-	"near_expiry_items",
 	"expense",
 	"bank_drop",
-	"list_of_invoices",
-	"list_of_cancelled_invoices",
-	"list_of_errors",
-	"list_of_purchase_invoices",
-	"list_of_quotations",
-	"list_of_stock_entries",
-	"list_of_local_purchases",
-	"list_of_stock_adjustments",
-	"list_of_expense",
-	"list_of_bank_drops",
-	"invoice_settlement_report",
-	"sales_report_by_time",
-	"sales_summary_by_hour",
 	"current_stock_by_brand",
-	"stock_register",
 	"current_stock_report",
 	"manage_role_permissions",
 )
diff --git a/xpos/api/invoices.py b/xpos/api/invoices.py
index 94a3c8b..613738d 100755
--- a/xpos/api/invoices.py
+++ b/xpos/api/invoices.py
@@ -314,11 +314,15 @@ def create_invoice(data: str | dict):
 
 	rate_precision = _get_item_rate_precision()
 
+	from xpos.api.auth import user_has_pos_permission
+
+	allow_rate_change = user_has_pos_permission("allow_change_price", pos_profile=pos.name)
+
 	for item_data in items:
 		item_rate = flt(item_data.get("rate", 0), rate_precision)
 		item_qty = flt(item_data.get("qty", 1), 3)
 
-		if not cint(pos.get("allow_rate_change")):
+		if not allow_rate_change:
 			price_list = pos.get("selling_price_list")
 			if price_list:
 				price_list_rate = frappe.db.get_value(
diff --git a/xpos/api/shifts.py b/xpos/api/shifts.py
index a6940b5..006b285 100755
--- a/xpos/api/shifts.py
+++ b/xpos/api/shifts.py
@@ -427,10 +427,14 @@ def _enrich_shift_data(data: dict, pos_profile: str):
 		data["taxes"] = []
 		data["tax_inclusive"] = 0
 
+	from xpos.api.auth import user_has_pos_permission
+
 	data["print_settings"] = {
 		"print_format": profile.get("print_format") or "POS Invoice",
 		"print_format_for_online": profile.get("print_format_for_online"),
-		"allow_print_before_pay": cint(profile.get("allow_print_draft_invoices")) or 0,
+		"allow_print_before_pay": 1
+		if user_has_pos_permission("print_draft_invoice", pos_profile=pos_profile)
+		else 0,
 		"auto_print_receipt": cint(profile.get("auto_print_receipt")) or 0,
 		"letter_head": profile.get("letter_head") or "",
 	}
diff --git a/xpos/install.py b/xpos/install.py
index 475fedd..88f8485 100755
--- a/xpos/install.py
+++ b/xpos/install.py
@@ -9,48 +9,21 @@
 
 POS_PERMISSIONS = (
 	# Billing & Invoicing
-	("close_bill", "Close Bill", "Billing & Invoicing"),
 	("close_shift", "Close Shift", "Billing & Invoicing"),
 	("allow_reprint_invoice", "Reprint Invoice", "Billing & Invoicing"),
+	("print_draft_invoice", "Print Draft Invoice", "Billing & Invoicing"),
 	("shift_report", "Shift Report", "Billing & Invoicing"),
-	("allow_cancel_invoice", "Cancel Invoice", "Billing & Invoicing"),
-	("unsettled_invoices", "Unsettled Invoices", "Billing & Invoicing"),
 	# Discounts & Pricing
 	("apply_additional_discount", "Apply Additional Discount", "Discounts & Pricing"),
-	("apply_standard_discount", "Apply Standard Discount", "Discounts & Pricing"),
 	("show_edit_discount_field", "Edit Discount Field", "Discounts & Pricing"),
-	("edit_tax_template", "Edit Tax Template", "Discounts & Pricing"),
 	("allow_change_price", "Change Price", "Discounts & Pricing"),
 	# Sales Operations
-	("quotation", "Quotation", "Sales Operations"),
 	("sale_return", "Sale Return", "Sales Operations"),
-	# Purchasing & Stock
-	("local_purchase", "Local Purchase", "Purchasing & Stock"),
-	("purchase_order", "Purchase Order", "Purchasing & Stock"),
-	("purchase_invoice", "Purchase Invoice", "Purchasing & Stock"),
-	("stock_adjustment", "Stock Adjustment", "Purchasing & Stock"),
-	("stock_entry", "Stock Entry", "Purchasing & Stock"),
-	("near_expiry_items", "Near Expiry Items", "Purchasing & Stock"),
 	# Cash Management
 	("expense", "Expense", "Cash Management"),
 	("bank_drop", "Bank Drop", "Cash Management"),
-	# Lists
-	("list_of_invoices", "List of Invoices", "Lists"),
-	("list_of_cancelled_invoices", "List of Cancelled Invoices", "Lists"),
-	("list_of_errors", "List of Errors", "Lists"),
-	("list_of_purchase_invoices", "List of Purchase Invoices", "Lists"),
-	("list_of_quotations", "List of Quotations", "Lists"),
-	("list_of_stock_entries", "List of Stock Entries", "Lists"),
-	("list_of_local_purchases", "List of Local Purchases", "Lists"),
-	("list_of_stock_adjustments", "List of Stock Adjustments", "Lists"),
-	("list_of_expense", "List of Expenses", "Lists"),
-	("list_of_bank_drops", "List of Bank Drops", "Lists"),
 	# Reports
-	("invoice_settlement_report", "Invoice Settlement Report", "Reports"),
-	("sales_report_by_time", "Sales Report by Time", "Reports"),
-	("sales_summary_by_hour", "Sales Summary by Hour", "Reports"),
 	("current_stock_by_brand", "Current Stock by Brand", "Reports"),
-	("stock_register", "Stock Register", "Reports"),
 	("current_stock_report", "Current Stock Report", "Reports"),
 	# Administration
 	("manage_role_permissions", "Manage Role Permissions", "Administration"),
@@ -58,8 +31,10 @@
 
 ALL_PERMISSION_NAMES = tuple(name for name, _label, _group in POS_PERMISSIONS)
 
-_CASHIER_ENABLED = {"close_bill", "list_of_invoices"}
-_MANAGER_DISABLED = {"list_of_errors", "manage_role_permissions"}
+# Cashiers ring up sales out of the box; every catalog permission is an elevated
+# capability, so none are enabled by default.
+_CASHIER_ENABLED: set[str] = set()
+_MANAGER_DISABLED = {"manage_role_permissions"}
 
 DEFAULT_ROLES = (
 	("Cashier", _CASHIER_ENABLED),
diff --git a/xpos/x_pos/custom/pos_profile.json b/xpos/x_pos/custom/pos_profile.json
index eeab5ea..4837016 100755
--- a/xpos/x_pos/custom/pos_profile.json
+++ b/xpos/x_pos/custom/pos_profile.json
@@ -166,7 +166,7 @@
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "allow_user_to_edit_additional_discount",
+   "insert_after": "auto_delete_draft_invoice",
    "is_system_generated": 0,
    "is_virtual": 0,
    "label": "Allow change posting date",
@@ -858,270 +858,6 @@
    "unique": 0,
    "width": null
   },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "alignment": "",
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "button_color": "",
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2026-03-01 19:07:26.285262",
-   "default": null,
-   "depends_on": null,
-   "description": null,
-   "docstatus": 0,
-   "dt": "POS Profile",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "allow_print_draft_invoices",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 95,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "use_server_cache",
-   "is_system_generated": 0,
-   "is_virtual": 0,
-   "label": "Allow print draft invoices",
-   "length": 0,
-   "link_filters": null,
-   "mandatory_depends_on": null,
-   "modified": "2026-03-01 23:50:45.216093",
-   "modified_by": "Administrator",
-   "module": "X POS",
-   "name": "POS Profile-allow_print_draft_invoices",
-   "no_copy": 0,
-   "non_negative": 0,
-   "options": null,
-   "owner": "Administrator",
-   "permlevel": 0,
-   "placeholder": null,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "show_dashboard": 0,
-   "sort_options": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "alignment": "",
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "button_color": "",
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2026-05-28 00:00:00.000000",
-   "default": null,
-   "depends_on": null,
-   "description": "When enabled, the POS terminal creates an unsettled invoice instead of collecting payment. A cashier settles it later from the Cashier screen.",
-   "docstatus": 0,
-   "dt": "POS Profile",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "enable_cashier_settlement",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "allow_print_draft_invoices",
-   "is_system_generated": 0,
-   "is_virtual": 0,
-   "label": "Enable cashier settlement",
-   "length": 0,
-   "link_filters": null,
-   "mandatory_depends_on": null,
-   "modified": "2026-05-28 00:00:00.000000",
-   "modified_by": "Administrator",
-   "module": "X POS",
-   "name": "POS Profile-enable_cashier_settlement",
-   "no_copy": 0,
-   "non_negative": 0,
-   "options": null,
-   "owner": "Administrator",
-   "permlevel": 0,
-   "placeholder": null,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "show_dashboard": 0,
-   "sort_options": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "alignment": "",
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "button_color": "",
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2026-05-28 00:00:00.000000",
-   "default": null,
-   "depends_on": "eval:doc.enable_cashier_settlement",
-   "description": "Print a non-genuine backup receipt for the customer at the terminal. No payment is collected; the genuine invoice is printed by the cashier after settlement.",
-   "docstatus": 0,
-   "dt": "POS Profile",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "print_backup_receipt",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "enable_cashier_settlement",
-   "is_system_generated": 0,
-   "is_virtual": 0,
-   "label": "Print backup receipt",
-   "length": 0,
-   "link_filters": null,
-   "mandatory_depends_on": null,
-   "modified": "2026-05-28 00:00:00.000000",
-   "modified_by": "Administrator",
-   "module": "X POS",
-   "name": "POS Profile-print_backup_receipt",
-   "no_copy": 0,
-   "non_negative": 0,
-   "options": null,
-   "owner": "Administrator",
-   "permlevel": 0,
-   "placeholder": null,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "show_dashboard": 0,
-   "sort_options": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "alignment": "",
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "button_color": "",
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2026-03-01 19:00:55.980833",
-   "default": null,
-   "depends_on": null,
-   "description": null,
-   "docstatus": 0,
-   "dt": "POS Profile",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "allow_print_last_invoice",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 124,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "section_break_tjwtr",
-   "is_system_generated": 0,
-   "is_virtual": 0,
-   "label": "Allow print last invoice",
-   "length": 0,
-   "link_filters": null,
-   "mandatory_depends_on": null,
-   "modified": "2026-03-01 23:50:23.806717",
-   "modified_by": "Administrator",
-   "module": "X POS",
-   "name": "POS Profile-allow_print_last_invoice",
-   "no_copy": 0,
-   "non_negative": 0,
-   "options": null,
-   "owner": "Administrator",
-   "permlevel": 0,
-   "placeholder": null,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "show_dashboard": 0,
-   "sort_options": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
   {
    "_assign": null,
    "_comments": null,
@@ -1650,72 +1386,6 @@
    "unique": 0,
    "width": null
   },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "alignment": "",
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "button_color": "",
-   "collapsible": 0,
-   "collapsible_depends_on": null,
-   "columns": 0,
-   "creation": "2026-03-01 17:44:40.742598",
-   "default": null,
-   "depends_on": null,
-   "description": null,
-   "docstatus": 0,
-   "dt": "POS Profile",
-   "fetch_from": null,
-   "fetch_if_empty": 0,
-   "fieldname": "allow_user_to_edit_additional_discount",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "hide_border": 0,
-   "hide_days": 0,
-   "hide_seconds": 0,
-   "idx": 63,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_preview": 0,
-   "in_standard_filter": 0,
-   "insert_after": "auto_delete_draft_invoice",
-   "is_system_generated": 0,
-   "is_virtual": 0,
-   "label": "Allow user to edit additional discount",
-   "length": 0,
-   "link_filters": null,
-   "mandatory_depends_on": null,
-   "modified": "2026-03-01 20:27:20.213935",
-   "modified_by": "Administrator",
-   "module": "X POS",
-   "name": "POS Profile-allow_user_to_edit_additional_discount",
-   "no_copy": 0,
-   "non_negative": 0,
-   "options": null,
-   "owner": "Administrator",
-   "permlevel": 0,
-   "placeholder": null,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": null,
-   "read_only": 0,
-   "read_only_depends_on": null,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "show_dashboard": 0,
-   "sort_options": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": null
-  },
   {
    "_assign": null,
    "_comments": null,
@@ -3268,7 +2938,7 @@
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "allow_print_last_invoice",
+   "insert_after": "section_break_tjwtr",
    "is_system_generated": 0,
    "is_virtual": 0,
    "label": "Default Print Format",
@@ -3762,6 +3432,72 @@
    "unique": 0,
    "width": null
   },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "alignment": "",
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "button_color": "",
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2026-05-28 00:00:00",
+   "default": null,
+   "depends_on": null,
+   "description": "When enabled, the POS terminal creates an unsettled invoice instead of collecting payment. A cashier settles it later from the Cashier screen.",
+   "docstatus": 0,
+   "dt": "POS Profile",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "enable_cashier_settlement",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "use_server_cache",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Enable cashier settlement",
+   "length": 0,
+   "link_filters": null,
+   "mandatory_depends_on": null,
+   "modified": "2026-05-28 00:00:00",
+   "modified_by": "Administrator",
+   "module": "X POS",
+   "name": "POS Profile-enable_cashier_settlement",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "placeholder": null,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
   {
    "_assign": null,
    "_comments": null,
@@ -4950,6 +4686,72 @@
    "unique": 0,
    "width": null
   },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "alignment": "",
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "button_color": "",
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2026-05-28 00:00:00",
+   "default": null,
+   "depends_on": "eval:doc.enable_cashier_settlement",
+   "description": "Print a non-genuine backup receipt for the customer at the terminal. No payment is collected; the genuine invoice is printed by the cashier after settlement.",
+   "docstatus": 0,
+   "dt": "POS Profile",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "print_backup_receipt",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "enable_cashier_settlement",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Print backup receipt",
+   "length": 0,
+   "link_filters": null,
+   "mandatory_depends_on": null,
+   "modified": "2026-05-28 00:00:00",
+   "modified_by": "Administrator",
+   "module": "X POS",
+   "name": "POS Profile-print_backup_receipt",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "placeholder": null,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
   {
    "_assign": null,
    "_comments": null,
@@ -6304,7 +6106,7 @@
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "allow_print_draft_invoices",
+   "insert_after": "use_server_cache",
    "is_system_generated": 0,
    "is_virtual": 0,
    "label": "Use delivery charges",
@@ -6608,15 +6410,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Opening & Closing",
+   "group": "Invoices",
    "hidden": 0,
-   "idx": 3,
+   "idx": 2,
    "is_child_table": 0,
-   "link_doctype": "POS Opening Entry",
+   "link_doctype": "POS Invoice",
    "link_fieldname": "pos_profile",
-   "modified": "2026-03-20 02:15:46.051110",
+   "modified": "2026-06-03 21:25:18.493203",
    "modified_by": "Administrator",
-   "name": "h643mf6nkv",
+   "name": "lih4lco854",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -6628,15 +6430,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Opening & Closing",
+   "group": "Invoices",
    "hidden": 0,
-   "idx": 4,
+   "idx": 1,
    "is_child_table": 0,
-   "link_doctype": "POS Closing Entry",
+   "link_doctype": "Sales Invoice",
    "link_fieldname": "pos_profile",
-   "modified": "2026-03-20 02:15:46.051110",
+   "modified": "2026-06-03 21:25:18.493203",
    "modified_by": "Administrator",
-   "name": "h64alb60lu",
+   "name": "liha2r2dls",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -6648,15 +6450,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Invoices",
+   "group": "Opening & Closing",
    "hidden": 0,
-   "idx": 2,
+   "idx": 3,
    "is_child_table": 0,
-   "link_doctype": "POS Invoice",
+   "link_doctype": "POS Opening Entry",
    "link_fieldname": "pos_profile",
-   "modified": "2026-03-20 02:15:46.051110",
+   "modified": "2026-06-03 21:25:18.493203",
    "modified_by": "Administrator",
-   "name": "h64dmju8r8",
+   "name": "lihhdnfjiq",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -6668,15 +6470,15 @@
    "creation": "2013-05-24 12:15:51",
    "custom": 0,
    "docstatus": 0,
-   "group": "Invoices",
+   "group": "Opening & Closing",
    "hidden": 0,
-   "idx": 1,
+   "idx": 4,
    "is_child_table": 0,
-   "link_doctype": "Sales Invoice",
+   "link_doctype": "POS Closing Entry",
    "link_fieldname": "pos_profile",
-   "modified": "2026-03-20 02:15:46.051110",
+   "modified": "2026-06-03 21:25:18.493203",
    "modified_by": "Administrator",
-   "name": "h64go76bk1",
+   "name": "lihk4qqib0",
    "owner": "Administrator",
    "parent": "POS Profile",
    "parent_doctype": null,
@@ -6699,7 +6501,7 @@
    "field_name": null,
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2026-05-23 20:49:15.479365",
+   "modified": "2026-06-05 11:12:56.215878",
    "modified_by": "Administrator",
    "module": null,
    "name": "POS Profile-main-field_order",
@@ -6707,7 +6509,7 @@
    "property": "field_order",
    "property_type": "Data",
    "row_name": null,
-   "value": "[\"company\", \"customer\", \"country\", \"disabled\", \"column_break_9\", \"warehouse\", \"company_address\", \"section_break_15\", \"applicable_for_users\", \"section_break_11\", \"payments\", \"section_break_14\", \"hide_images\", \"hide_unavailable_items\", \"auto_add_item_to_cart\", \"validate_stock_on_save\", \"print_receipt_on_order_complete\", \"action_on_new_invoice\", \"column_break_16\", \"update_stock\", \"ignore_pricing_rule\", \"allow_rate_change\", \"allow_discount_change\", \"set_grand_total_to_default_mop\", \"allow_partial_payment\", \"section_break_23\", \"item_groups\", \"column_break_25\", \"customer_groups\", \"section_break_16\", \"print_format\", \"letter_head\", \"column_break0\", \"tc_name\", \"select_print_heading\", \"section_break_19\", \"selling_price_list\", \"currency\", \"write_off_account\", \"write_off_cost_center\", \"write_off_limit\", \"account_for_change_amount\", \"disable_rounded_total\", \"column_break_23\", \"income_account\", \"expense_account\", \"taxes_and_charges\", \"tax_category\", \"apply_discount_on\", \"accounting_dimensions_section\", \"cost_center\", \"dimension_col_break\", \"project\", \"utm_analytics_section\", \"utm_source\", \"column_break_tvls\", \"utm_campaign\", \"column_break_xygw\", \"utm_medium\", \"pos_settings\", \"settings_section\", \"auto_delete_draft_invoice\", \"allow_user_to_edit_additional_discount\", \"allow_change_posting_date\", \"allow_credit_sale\", \"allow_return\", \"allow_return_without_invoice\", \"allow_delete\", \"allow_sales_order\", \"allow_free_batch_return\", \"allow_multi_currency\", \"apply_customer_discount\", \"allow_duplicate_customer_names\", \"tax_inclusive\", \"allow_zero_rated_items\", \"hide_expected_amount\", \"display_additional_notes\", \"allow_write_off_change\", \"hide_variants_items\", \"force_price_from_customer_price_list\", \"column_break_zfglz\", \"use_cashback\", \"use_customer_credit\", \"hide_closing_shift\", \"display_item_code\", \"display_items_in_stock\", \"show_template_items\", \"input_qty\", \"auto_set_batch\", \"search_serial_no\", \"search_batch_no\", \"use_limit_search\", \"force_reload_items\", \"use_server_cache\", \"allow_print_draft_invoices\", \"enable_cashier_settlement\", \"print_backup_receipt\", \"use_delivery_charges\", \"auto_set_delivery_charges\", \"show_customer_balance\", \"column_break_aebm5\", \"max_discount_percentage_allowed\", \"default_view\", \"server_cache_duration\", \"item_search_limit\", \"pos_payments_section\", \"default_pos_expense_account\", \"cash_mode_of_payment\", \"back_office_cash_account\", \"default_source_account\", \"cash_movement_max_amount\", \"allowed_source_accounts\", \"allowed_expense_accounts\", \"column_break_gw92o\", \"allow_pos_expense\", \"allow_source_account_override\", \"require_cash_movement_remarks\", \"allow_delete_cancelled_cash_movement\", \"allow_cancel_submitted_cash_movement\", \"enable_cash_movement\", \"allow_make_new_payments\", \"allow_reconcile_payments\", \"use_pos_payments\", \"allow_cash_deposit\", \"section_break_tjwtr\", \"allow_print_last_invoice\", \"default_print_format\", \"print_format_rules\", \"print_discount_amount\", \"referral_settings\", \"auto_create_referral_for_new_customers\", \"auto_fetch_coupons_gifts\", \"fbr_integration_section\", \"enable_fbr_integration\", \"fbr_environment\", \"fbr_pos_id\", \"column_break_fbr\", \"fbr_bearer_token\", \"fbr_api_url\", \"fbr_skip_ssl_verification\", \"selling\", \"allowed_sales_persons\", \"column_break_pvbpj\", \"use_offline_mode\", \"fetch_items_directly_from_server\", \"block_sale_beyond_available_qty\", \"allow_submissions_in_background_job\", \"allow_delete_offline_invoice\", \"allow_delete_draft_invoices\", \"enable_return_validity\", \"return_validity_days\", \"column_break_tgaeu\", \"purchasing\", \"allow_create_purchase_items\", \"allow_create_purchase_suppliers\", \"allow_purchase_receipt\", \"allow_purchase_order\", \"update_selling_price\", \"update_buying_price\", \"default_purchase_uom\", \"purchase_taxes\", \"column_break_cnwjh\", \"display_authorization_code\"]"
+   "value": "[\"company\", \"customer\", \"country\", \"disabled\", \"column_break_9\", \"warehouse\", \"company_address\", \"section_break_15\", \"applicable_for_users\", \"section_break_11\", \"payments\", \"section_break_14\", \"hide_images\", \"hide_unavailable_items\", \"auto_add_item_to_cart\", \"validate_stock_on_save\", \"print_receipt_on_order_complete\", \"action_on_new_invoice\", \"column_break_16\", \"update_stock\", \"ignore_pricing_rule\", \"allow_rate_change\", \"allow_discount_change\", \"set_grand_total_to_default_mop\", \"allow_partial_payment\", \"section_break_23\", \"item_groups\", \"column_break_25\", \"customer_groups\", \"section_break_16\", \"print_format\", \"letter_head\", \"column_break0\", \"tc_name\", \"select_print_heading\", \"section_break_19\", \"selling_price_list\", \"currency\", \"write_off_account\", \"write_off_cost_center\", \"write_off_limit\", \"account_for_change_amount\", \"disable_rounded_total\", \"column_break_23\", \"income_account\", \"expense_account\", \"taxes_and_charges\", \"tax_category\", \"apply_discount_on\", \"accounting_dimensions_section\", \"cost_center\", \"dimension_col_break\", \"project\", \"utm_analytics_section\", \"utm_source\", \"column_break_tvls\", \"utm_campaign\", \"column_break_xygw\", \"utm_medium\", \"pos_settings\", \"settings_section\", \"auto_delete_draft_invoice\", \"allow_change_posting_date\", \"allow_credit_sale\", \"allow_return\", \"allow_return_without_invoice\", \"allow_delete\", \"allow_sales_order\", \"allow_free_batch_return\", \"allow_multi_currency\", \"apply_customer_discount\", \"allow_duplicate_customer_names\", \"tax_inclusive\", \"allow_zero_rated_items\", \"hide_expected_amount\", \"display_additional_notes\", \"allow_write_off_change\", \"hide_variants_items\", \"force_price_from_customer_price_list\", \"column_break_zfglz\", \"use_cashback\", \"use_customer_credit\", \"hide_closing_shift\", \"display_item_code\", \"display_items_in_stock\", \"show_template_items\", \"input_qty\", \"auto_set_batch\", \"search_serial_no\", \"search_batch_no\", \"use_limit_search\", \"force_reload_items\", \"use_server_cache\", \"enable_cashier_settlement\", \"print_backup_receipt\", \"use_delivery_charges\", \"auto_set_delivery_charges\", \"show_customer_balance\", \"column_break_aebm5\", \"max_discount_percentage_allowed\", \"default_view\", \"server_cache_duration\", \"item_search_limit\", \"pos_payments_section\", \"default_pos_expense_account\", \"cash_mode_of_payment\", \"back_office_cash_account\", \"default_source_account\", \"cash_movement_max_amount\", \"allowed_source_accounts\", \"allowed_expense_accounts\", \"column_break_gw92o\", \"allow_pos_expense\", \"allow_source_account_override\", \"require_cash_movement_remarks\", \"allow_delete_cancelled_cash_movement\", \"allow_cancel_submitted_cash_movement\", \"enable_cash_movement\", \"allow_make_new_payments\", \"allow_reconcile_payments\", \"use_pos_payments\", \"allow_cash_deposit\", \"section_break_tjwtr\", \"default_print_format\", \"print_format_rules\", \"print_discount_amount\", \"referral_settings\", \"auto_create_referral_for_new_customers\", \"auto_fetch_coupons_gifts\", \"fbr_integration_section\", \"enable_fbr_integration\", \"fbr_environment\", \"fbr_pos_id\", \"column_break_fbr\", \"fbr_bearer_token\", \"fbr_api_url\", \"fbr_skip_ssl_verification\", \"selling\", \"allowed_sales_persons\", \"column_break_pvbpj\", \"use_offline_mode\", \"fetch_items_directly_from_server\", \"block_sale_beyond_available_qty\", \"allow_submissions_in_background_job\", \"allow_delete_offline_invoice\", \"allow_delete_draft_invoices\", \"enable_return_validity\", \"return_validity_days\", \"column_break_tgaeu\", \"purchasing\", \"allow_create_purchase_items\", \"allow_create_purchase_suppliers\", \"allow_purchase_receipt\", \"allow_purchase_order\", \"update_selling_price\", \"update_buying_price\", \"default_purchase_uom\", \"purchase_taxes\", \"column_break_cnwjh\", \"display_authorization_code\"]"
   },
   {
    "_assign": null,
@@ -6722,7 +6524,7 @@
    "field_name": "utm_analytics_section",
    "idx": 0,
    "is_system_generated": 1,
-   "modified": "2026-05-23 20:49:15.530433",
+   "modified": "2026-06-05 11:12:56.254429",
    "modified_by": "Administrator",
    "module": null,
    "name": "POS Profile-utm_analytics_section-hidden",
diff --git a/xpos/x_pos/custom/pos_profile_user.json b/xpos/x_pos/custom/pos_profile_user.json
index 9731a00..73bdd50 100755
--- a/xpos/x_pos/custom/pos_profile_user.json
+++ b/xpos/x_pos/custom/pos_profile_user.json
@@ -216,7 +216,7 @@
    "field_name": null,
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2026-06-04 14:50:22.013939",
+   "modified": "2026-06-05 11:12:56.512056",
    "modified_by": "Administrator",
    "module": null,
    "name": "POS Profile User-main-field_order",

From b77d0b51da98967355920fac324e21e687e6f534 Mon Sep 17 00:00:00 2001
From: Ali Raza <soundsofnation29@gmail.com>
Date: Sat, 6 Jun 2026 12:07:47 +0500
Subject: [PATCH 4/5] chore: update license information and remove old license
 file

---
 license.txt => LICENSE | 0
 README.md              | 8 +-------
 2 files changed, 1 insertion(+), 7 deletions(-)
 rename license.txt => LICENSE (100%)

diff --git a/license.txt b/LICENSE
similarity index 100%
rename from license.txt
rename to LICENSE
diff --git a/README.md b/README.md
index 9390d0b..04984a2 100755
--- a/README.md
+++ b/README.md
@@ -208,12 +208,6 @@ docs: update installation instructions
 
 ## License
 
-MIT — see [license.txt](license.txt) for full terms.
+MIT — see [LICENSE](LICENSE) for full terms.
 
 ---
-
-<div align="center">
-
-Developed and maintained by **Ali Raza** — [ar.frappe.dev@gmail.com](mailto:ar.frappe.dev@gmail.com)
-
-</div>

From d9fcefd2d026c8db2c60bf6d032e4f941d95a2a0 Mon Sep 17 00:00:00 2001
From: Ali Raza <soundsofnation29@gmail.com>
Date: Sat, 6 Jun 2026 13:09:51 +0500
Subject: [PATCH 5/5] refactor: update link count and remove unused POS
 Permission link

---
 xpos/x_pos/workspace/x_pos/x_pos.json | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/xpos/x_pos/workspace/x_pos/x_pos.json b/xpos/x_pos/workspace/x_pos/x_pos.json
index ddd737f..a59eb52 100755
--- a/xpos/x_pos/workspace/x_pos/x_pos.json
+++ b/xpos/x_pos/workspace/x_pos/x_pos.json
@@ -268,7 +268,7 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Setup",
-   "link_count": 7,
+   "link_count": 6,
    "link_type": "DocType",
    "onboard": 0,
    "type": "Card Break"
@@ -303,16 +303,6 @@
    "onboard": 0,
    "type": "Link"
   },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "POS Permission",
-   "link_count": 0,
-   "link_to": "POS Permission",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
   {
    "hidden": 0,
    "is_query_report": 0,
@@ -344,7 +334,7 @@
    "type": "Link"
   }
  ],
- "modified": "2026-06-04 15:26:50.429253",
+ "modified": "2026-06-06 12:12:41.123126",
  "modified_by": "Administrator",
  "module": "X POS",
  "name": "X POS",