From 0a1ee31b3fd40c6b82e24b89eb2a3aff0d129df8 Mon Sep 17 00:00:00 2001
From: Alexandre <aperebaskine@ctgalega.com>
Date: Mon, 5 Jan 2026 09:46:52 +0100
Subject: [PATCH 1/3] feat: add functionality for specifying custom item names
 per-invoice

---
 POS/src/components/sale/EditItemDialog.vue    |  70 ++++++++++-
 POS/src/composables/useInvoice.js             |   1 +
 POS/src/stores/posCart.js                     |   1 +
 POS/src/stores/posSettings.js                 |  11 ++
 pos_next/api/bootstrap.py                     |  10 +-
 pos_next/api/invoices.py                      |  57 +++++++++
 pos_next/api/items.py                         |   3 +
 pos_next/api/pos_profile.py                   |   9 +-
 pos_next/fixtures/custom_field.json           | 116 ++++++++++++++++++
 pos_next/hooks.py                             |   4 +-
 .../__init__.py                               |   0
 ..._item_name_customization_allowed_user.json |  35 ++++++
 ...os_item_name_customization_allowed_user.py |   9 ++
 .../doctype/pos_settings/pos_settings.js      |  27 ++++
 .../doctype/pos_settings/pos_settings.json    |  25 ++++
 .../doctype/pos_settings/pos_settings.py      |  36 ++++++
 16 files changed, 404 insertions(+), 10 deletions(-)
 create mode 100644 pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/__init__.py
 create mode 100644 pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.json
 create mode 100644 pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.py

diff --git a/POS/src/components/sale/EditItemDialog.vue b/POS/src/components/sale/EditItemDialog.vue
index ca34cb4b..d986ec0a 100644
--- a/POS/src/components/sale/EditItemDialog.vue
+++ b/POS/src/components/sale/EditItemDialog.vue
@@ -28,10 +28,35 @@
 						</svg>
 					</div>
 					<!-- Item Info -->
-					<div class="flex-1 min-w-0">
-						<h3 class="text-base font-semibold text-gray-900 truncate">
-							{{ localItem.item_name }}
-						</h3>
+					<div class="flex flex-col flex-1 min-w-0 gap-2">
+						<!-- Item Name Editor -->
+						<div>
+							<div class="flex gap-2 items-center" v-if="isItemNameEditable">
+								<input
+								v-model="localItemName"
+								type="text"
+								class="w-full h-10 border border-gray-300 rounded-lg px-3 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+								:placeholder="__('Enter item name')"
+								@blur="handleItemNameBlur"
+								/>
+								<Button 
+									variant="ghost" 
+									:title="__('Reset')" 
+									:aria-label="__('Reset')"
+									@click="restoreOriginalItemName"
+								>
+									<svg fill="none" class="h-4 w-4" viewBox="0 0 24 24" stroke-width="1" stroke="currentColor">
+										<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+									</svg>
+								</Button>
+							</div>
+							<h3 v-else class="text-base font-semibold text-gray-900 truncate">
+								{{ localItemName }}
+							</h3>
+						</div>
+						<p class="text-sm text-gray-500 truncate">
+							{{ localItem.item_code }}
+						</p>
 						<p class="text-sm text-gray-500 truncate">
 							{{ formatCurrency(localItem.price_list_rate || localItem.rate) }} / {{ localItem.stock_uom || __('Nos', null, 'UOM') }}
 						</p>
@@ -209,7 +234,7 @@
 				<Button
 					variant="solid"
 					@click="updateItem"
-					:disabled="!hasStock || isCheckingStock"
+					:disabled="!hasStock || !localItemName || isCheckingStock"
 				>
 					<span v-if="isCheckingStock">{{ __('Checking Stock...') }}</span>
 					<span v-else-if="!hasStock">{{ __('No Stock Available') }}</span>
@@ -224,6 +249,7 @@
 import { useToast } from "@/composables/useToast"
 import { usePOSSettingsStore } from "@/stores/posSettings"
 import { useSerialNumberStore } from "@/stores/serialNumber"
+import { useItemSearchStore } from "../../stores/itemSearch"
 import { getItemStock } from "@/utils/stockValidator"
 import { formatCurrency as formatCurrencyUtil, getCurrencySymbol } from "@/utils/currency"
 import { Button, Dialog } from "frappe-ui"
@@ -233,6 +259,7 @@ import SelectInput from "@/components/common/SelectInput.vue"
 const { showSuccess, showError, showWarning } = useToast()
 const settingsStore = usePOSSettingsStore()
 const serialStore = useSerialNumberStore()
+const { getItem } = useItemSearchStore()
 
 const props = defineProps({
 	modelValue: Boolean,
@@ -251,6 +278,11 @@ const emit = defineEmits(["update:modelValue", "update-item"])
 
 // Local state
 const localItem = ref(null)
+
+// Store item name states for item name customization
+const localItemName = ref("")
+const originalItemName = ref("")
+
 const localQuantity = ref(1)
 const localUom = ref("")
 const localRate = ref(0)
@@ -313,6 +345,14 @@ watch(
 	(newItem) => {
 		if (newItem) {
 			localItem.value = { ...newItem }
+
+			localItemName.value = newItem.item_name || ""
+
+			// Track original name from cache to restore when appropriate
+			originalItemName.value = newItem.item_name || "" // Initial value as fallback
+			getItem(localItem.value.item_code)
+				.then((item) => originalItemName.value = item.item_name)
+
 			localQuantity.value = newItem.quantity || 1
 			localUom.value = newItem.uom || newItem.stock_uom || __("Nos")
 			localRate.value = newItem.rate || 0
@@ -355,6 +395,22 @@ watch(
 	{ immediate: true },
 )
 
+const isItemNameEditable = computed(() => {
+	const allowedForPOS = settingsStore.allowCustomItemNameInCart 
+	const allowedForItem = localItem.value.custom_allow_custom_item_name_in_cart
+	return allowedForPOS && allowedForItem
+})
+
+function restoreOriginalItemName() {
+	localItemName.value = originalItemName.value
+}
+
+function handleItemNameBlur() {
+	if (!localItemName.value) {
+		restoreOriginalItemName()
+	}
+}
+
 /**
  * Intelligently determine the step size based on current quantity
  * - Whole numbers (1, 2, 3): step by 1
@@ -533,6 +589,10 @@ function updateItem() {
 			discountType.value === "amount" ? discountValue.value : 0,
 	}
 
+	if (settingsStore.allowCustomItemNameInCart) {
+		updatedItem.item_name = localItemName.value || originalItemName.value
+	}
+
 	// Update serial numbers if item has serials
 	if (localItem.value.has_serial_no) {
 		updatedItem.serial_no = localSerials.value.join('\n')
diff --git a/POS/src/composables/useInvoice.js b/POS/src/composables/useInvoice.js
index 78430d35..312ce8cf 100644
--- a/POS/src/composables/useInvoice.js
+++ b/POS/src/composables/useInvoice.js
@@ -216,6 +216,7 @@ export function useInvoice() {
 				// Add item_group and brand for offer eligibility checking
 				item_group: item.item_group,
 				brand: item.brand,
+				custom_allow_custom_item_name_in_cart: item.custom_allow_custom_item_name_in_cart
 			}
 			invoiceItems.value.push(newItem)
 			// Recalculate the newly added item to apply taxes
diff --git a/POS/src/stores/posCart.js b/POS/src/stores/posCart.js
index c8552e27..94084df9 100644
--- a/POS/src/stores/posCart.js
+++ b/POS/src/stores/posCart.js
@@ -1337,6 +1337,7 @@ export const usePOSCartStore = defineStore("posCart", () => {
 			}
 
 			// Apply other updates
+			if (settingsStore.allowCustomItemNameInCart && updates.item_name !== undefined) cartItem.item_name = updates.item_name
 			if (updates.quantity !== undefined) cartItem.quantity = updates.quantity
 			if (updates.warehouse !== undefined) cartItem.warehouse = updates.warehouse
 			if (updates.discount_percentage !== undefined) cartItem.discount_percentage = updates.discount_percentage
diff --git a/POS/src/stores/posSettings.js b/POS/src/stores/posSettings.js
index 5de2f0f9..708a2227 100644
--- a/POS/src/stores/posSettings.js
+++ b/POS/src/stores/posSettings.js
@@ -61,6 +61,8 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 		allow_negative_stock: 0,
 		// Sales Persons
 		enable_sales_persons: "Disabled",
+		// Item Name Customization
+		allow_custom_item_name_in_cart: 0
 	})
 
 	const isLoading = ref(false)
@@ -216,6 +218,11 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 		settings.value.enable_sales_persons === "Multiple"
 	)
 
+	// Computed - Item Name Customization
+	const allowCustomItemNameInCart = computed(() => 
+		Boolean(settings.value.allow_custom_item_name_in_cart)
+	)
+
 	// Resource
 	const settingsResource = createResource({
 		url: "pos_next.pos_next.doctype.pos_settings.pos_settings.get_pos_settings",
@@ -319,6 +326,7 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 			input_qty: 0,
 			allow_negative_stock: 0,
 			enable_sales_persons: "Disabled",
+			allow_custom_item_name_in_cart: 0
 		}
 		isLoaded.value = false
 	}
@@ -448,6 +456,9 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 		isSingleSalesPerson,
 		isMultipleSalesPersons,
 
+		// Computed - Item Name Customization
+		allowCustomItemNameInCart,
+
 		// Actions
 		loadSettings,
 		reloadSettings,
diff --git a/pos_next/api/bootstrap.py b/pos_next/api/bootstrap.py
index 0f2cfd02..4e522380 100644
--- a/pos_next/api/bootstrap.py
+++ b/pos_next/api/bootstrap.py
@@ -15,6 +15,8 @@
 import frappe
 from frappe import _
 
+from pos_next.pos_next.doctype.pos_settings.pos_settings import is_item_name_customization_enabled_for_user
+
 
 @frappe.whitelist()
 def get_initial_data():
@@ -154,13 +156,16 @@ def get_pos_settings(pos_profile):
 				"silent_print",
 				"allow_sales_order",
 				"allow_select_sales_order",
-				"create_only_sales_order"
+				"create_only_sales_order",
+				"allow_custom_item_name_in_cart"
 			],
 			as_dict=True
 		)
 
 		if not pos_settings:
 			return get_default_pos_settings()
+		
+		pos_settings["allow_custom_item_name_in_cart"] = is_item_name_customization_enabled_for_user(pos_settings)
 
 		return pos_settings
 	except Exception:
@@ -188,7 +193,8 @@ def get_default_pos_settings():
 		"silent_print": 0,
 		"allow_sales_order": 0,
 		"allow_select_sales_order": 0,
-		"create_only_sales_order": 0
+		"create_only_sales_order": 0,
+		"allow_custom_item_name_in_cart": 0
 	}
 
 
diff --git a/pos_next/api/invoices.py b/pos_next/api/invoices.py
index 834d27cd..6e04ecfc 100644
--- a/pos_next/api/invoices.py
+++ b/pos_next/api/invoices.py
@@ -315,6 +315,9 @@ def update_invoice(data):
         # Ensure the document type is set
         data.setdefault("doctype", doctype)
 
+        # Validate item name customizations in invoice data
+        _validate_invoice_item_names(data)
+
         # Create or update invoice
         if data.get("name"):
             invoice_doc = frappe.get_doc(doctype, data.get("name"))
@@ -528,6 +531,60 @@ def update_invoice(data):
         raise
 
 
+def _validate_invoice_item_names(data):
+    """
+    Validates that custom item names are provided only if the feature is enabled for both the POS and all relevant items.
+    Raises an error if any item contains a custom name where it is not allowed.
+    
+    :param data: The request data
+    :rtype: None
+    """
+
+    item_data = data.get("items")
+    pos_profile = data.get("pos_profile")
+
+    if not pos_profile: # Assume feature is disabled
+        is_enabled = False
+    else:
+        is_enabled = frappe.db.get_value(
+            "POS Settings",
+            { "pos_profile": pos_profile },
+            "allow_custom_item_name_in_cart"
+            )
+
+    item_codes = [x["item_code"] for x in item_data]
+
+    # Fetch items from database to compare names
+    db_items = {
+        item["item_code"]: item
+        for item in frappe.db.get_list(
+            "Item", 
+            fields=["item_code", "item_name", "custom_allow_custom_item_name_in_cart"],
+            filters={"item_code": ["in", item_codes]}
+        )
+    }
+
+    for item in item_data:
+        db_item = db_items[item["item_code"]]
+
+        # If item name is not present, set the one from database
+        if not item["item_name"]:
+            item["item_name"] = db_item["item_name"]
+            continue
+        
+        # Invoice item that matches database item name is always valid
+        if item["item_name"] == db_item["item_name"]:
+            continue
+
+        # Check if feature is enabled for both POS and item
+        if not is_enabled or not db_item["custom_allow_custom_item_name_in_cart"]:
+            frappe.throw(_("Not allowed to set custom name {0} for item {1} (Item Code: {2}).").format(
+                item["item_name"],
+                db_item["item_name"],
+                item["item_code"]
+            ))
+
+
 PENDING_TIMEOUT_MINUTES = 5  # Pending records older than this are considered stale
 
 
diff --git a/pos_next/api/items.py b/pos_next/api/items.py
index 34e80481..a09fa48f 100644
--- a/pos_next/api/items.py
+++ b/pos_next/api/items.py
@@ -26,6 +26,7 @@
 	"has_variants",
 	"custom_company",
 	"disabled",
+	"custom_allow_custom_item_name_in_cart"
 ]
 
 ITEM_RESULT_COLUMNS = ",\n\t".join(ITEM_RESULT_FIELDS)
@@ -493,6 +494,7 @@ def get_item_variants(template_item, pos_profile):
 				"item_group",
 				"brand",
 				"custom_company",
+				"custom_allow_custom_item_name_in_cart"
 			],
 		)
 
@@ -1033,6 +1035,7 @@ def get_items(pos_profile, search_term=None, item_group=None, start=0, limit=20)
 					"has_variants",
 					"custom_company",
 					"disabled",
+					"custom_allow_custom_item_name_in_cart"
 				],
 				start=start,
 				page_length=limit,
diff --git a/pos_next/api/pos_profile.py b/pos_next/api/pos_profile.py
index c666a543..4bd8c47a 100644
--- a/pos_next/api/pos_profile.py
+++ b/pos_next/api/pos_profile.py
@@ -8,6 +8,7 @@
 from pos_next.api.utilities import check_user_company
 from pos_next.api.utilities import _parse_list_parameter
 
+from pos_next.pos_next.doctype.pos_settings.pos_settings import is_item_name_customization_enabled_for_user
 
 @frappe.whitelist()
 def get_pos_profiles():
@@ -88,7 +89,8 @@ def get_pos_settings(pos_profile):
 				"enable_sales_persons",
 				"allow_sales_order",
 				"allow_select_sales_order",
-				"create_only_sales_order"
+				"create_only_sales_order",
+				"allow_custom_item_name_in_cart"
 			],
 			as_dict=True
 		)
@@ -111,8 +113,11 @@ def get_pos_settings(pos_profile):
 				"enable_sales_persons": "Disabled",
 				"allow_sales_order": 0,
 				"allow_select_sales_order": 0,
-				"create_only_sales_order": 0
+				"create_only_sales_order": 0,
+				"allow_custom_item_name_in_cart": 0
 			}
+		
+		pos_settings["allow_custom_item_name_in_cart"] = is_item_name_customization_enabled_for_user(pos_settings)
 
 		return pos_settings
 	except Exception as e:
diff --git a/pos_next/fixtures/custom_field.json b/pos_next/fixtures/custom_field.json
index c0a8fb93..cca216ce 100644
--- a/pos_next/fixtures/custom_field.json
+++ b/pos_next/fixtures/custom_field.json
@@ -511,5 +511,121 @@
   "translatable": 0,
   "unique": 0,
   "width": null
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "button_color": "",
+  "collapsible": 1,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "Item",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "custom_posnext",
+  "fieldtype": "Section Break",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 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": "uoms",
+  "is_system_generated": 0,
+  "is_virtual": 0,
+  "label": "POSNext",
+  "length": 0,
+  "link_filters": null,
+  "mandatory_depends_on": null,
+  "modified": "2026-01-02 11:59:34.437995",
+  "module": "POS Next",
+  "name": "Item-custom_posnext",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "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
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "button_color": "",
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": "Allow user to modify the item name in cart. This applies to a single POS invoice only and does not modify the actual item name.",
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "Item",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "custom_allow_custom_item_name_in_cart",
+  "fieldtype": "Check",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 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": "custom_posnext",
+  "is_system_generated": 0,
+  "is_virtual": 0,
+  "label": "Allow Custom Item Name in Cart",
+  "length": 0,
+  "link_filters": null,
+  "mandatory_depends_on": null,
+  "modified": "2026-01-02 12:02:10.439469",
+  "module": "POS Next",
+  "name": "Item-custom_allow_custom_item_name_in_cart",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "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
  }
 ]
diff --git a/pos_next/hooks.py b/pos_next/hooks.py
index 753ae2db..e21abd80 100644
--- a/pos_next/hooks.py
+++ b/pos_next/hooks.py
@@ -100,7 +100,9 @@
 					"POS Profile-posa_cash_mode_of_payment",
 					"POS Profile-posa_allow_delete",
 					"POS Profile-posa_block_sale_beyond_available_qty",
-					"Mode of Payment-is_wallet_payment"
+					"Mode of Payment-is_wallet_payment",
+                    "Item-custom_posnext",
+                    "Item-custom_allow_custom_item_name_in_cart"
 				]
 			]
 		]
diff --git a/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/__init__.py b/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.json b/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.json
new file mode 100644
index 00000000..61b014e7
--- /dev/null
+++ b/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.json
@@ -0,0 +1,35 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-01-02 13:22:40.959820",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "user"
+ ],
+ "fields": [
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "User",
+   "options": "User",
+   "reqd": 1
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-01-02 13:22:57.731997",
+ "modified_by": "Administrator",
+ "module": "POS Next",
+ "name": "POS Item Name Customization Allowed User",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.py b/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.py
new file mode 100644
index 00000000..560363af
--- /dev/null
+++ b/pos_next/pos_next/doctype/pos_item_name_customization_allowed_user/pos_item_name_customization_allowed_user.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, BrainWise and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class POSItemNameCustomizationAllowedUser(Document):
+	pass
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.js b/pos_next/pos_next/doctype/pos_settings/pos_settings.js
index 27e15eef..c6cd515e 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.js
+++ b/pos_next/pos_next/doctype/pos_settings/pos_settings.js
@@ -3,6 +3,9 @@
 
 frappe.ui.form.on("POS Settings", {
 	refresh(frm) {
+		// Filter allowed users in Item Name Customization Table MultiSelect field, showing only users added to the POS Profile
+		update_item_name_customization_query(frm)
+
 		// Set query for loyalty program filtered by POS Profile company
 		frm.set_query("default_loyalty_program", function () {
 			if (!frm.doc.__company) {
@@ -22,6 +25,9 @@ frappe.ui.form.on("POS Settings", {
 	},
 
 	pos_profile(frm) {
+		// Filter allowed users in Item Name Customization Table MultiSelect field, showing only users added to the POS Profile
+		update_item_name_customization_query(frm)
+
 		// Clear loyalty program when POS Profile changes
 		frm.set_value("default_loyalty_program", "");
 		frm.doc.__company = null;
@@ -39,3 +45,24 @@ function fetch_pos_profile_company(frm) {
 		}
 	});
 }
+
+function update_item_name_customization_query(frm) {
+	get_eligible_item_name_customization_users(frm).then((users) =>
+		frm.set_query("allow_custom_item_name_in_cart_allowed_users", () => ({
+			filters: {
+				name: ["in", users],
+			},
+		}))
+	);
+}
+
+async function get_eligible_item_name_customization_users(frm) {
+	const pos_profile = frm.doc.pos_profile;
+
+	if (!pos_profile) {
+		return [];
+	}
+
+	const users = (await frappe.db.get_doc("POS Profile", pos_profile)).applicable_for_users;
+	return users.map((user) => user.user);
+}
\ No newline at end of file
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.json b/pos_next/pos_next/doctype/pos_settings/pos_settings.json
index badd1c88..51af7e71 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.json
+++ b/pos_next/pos_next/doctype/pos_settings/pos_settings.json
@@ -63,6 +63,9 @@
   "allow_submissions_in_background_job",
   "allow_delete_offline_invoice",
   "allow_change_posting_date",
+  "item_name_customization_section",
+  "allow_custom_item_name_in_cart",
+  "allow_custom_item_name_in_cart_allowed_users",
   "section_break_misc",
   "input_qty",
   "allow_negative_stock"
@@ -488,6 +491,27 @@
    "fieldtype": "Check",
    "label": "Allow Negative Stock",
    "description": "Enable selling items even when stock reaches zero or below. Integrates with ERPNext negative stock settings."
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "item_name_customization_section",
+   "fieldtype": "Section Break",
+   "label": "Item Name Customization"
+  },
+  {
+   "default": "0",
+   "description": "Allow users to specify a custom item name for an item in cart. This feature must be enabled on a per-item basis in Item DocType.",
+   "fieldname": "allow_custom_item_name_in_cart",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "depends_on": "eval:doc.allow_custom_item_name_in_cart",
+   "description": "List of users for whom this feature is enabled",
+   "fieldname": "allow_custom_item_name_in_cart_allowed_users",
+   "fieldtype": "Table MultiSelect",
+   "label": "Allowed Users",
+   "options": "POS Item Name Customization Allowed User"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -528,6 +552,7 @@
    "role": "Sales User"
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.py b/pos_next/pos_next/doctype/pos_settings/pos_settings.py
index abad105e..513abe66 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.py
+++ b/pos_next/pos_next/doctype/pos_settings/pos_settings.py
@@ -109,9 +109,45 @@ def get_pos_settings(pos_profile):
 		frappe.db.get_single_value("Stock Settings", "allow_negative_stock") or 0
 	)
 
+	# Return Item Name Customization information for the current user only
+	settings["allow_custom_item_name_in_cart"] = is_item_name_customization_enabled_for_user(settings)
+
 	return settings
 
 
+def is_item_name_customization_enabled_for_user(pos_settings: str | dict) -> 0 | 1:
+	"""
+	Returns whether the item name customization feature is enabled for the POS and whether the user is authorized to use it.
+	
+	:param pos_settings: The name of the POS Settings for the current point of sale
+	:type pos_settings: str | dict POS Settings name or dict
+	:return: 1 if item name customization is enabled and allowed for the user, else 0
+	:rtype: 0 | 1
+	"""
+
+	if isinstance(pos_settings, str):
+		if not frappe.db.get_value(
+			"POS Settings",
+			pos_settings,
+			"allow_custom_item_name_in_cart"
+		):
+			return 0
+	elif not pos_settings.allow_custom_item_name_in_cart:
+		return 0
+	
+	user = frappe.session.user
+	is_user_allowed = frappe.db.exists(
+		"POS Item Name Customization Allowed User",
+		{
+			"parenttype": "POS Settings",
+			"parent": pos_settings.get("name") if isinstance(pos_settings, dict) else pos_settings,
+			"user": user
+		}
+	)
+	
+	return 1 if is_user_allowed else 0
+
+
 def create_default_settings(pos_profile):
 	"""Create default POS Settings for a POS Profile"""
 	doc = frappe.new_doc("POS Settings")

From 999bc4c863d7be115be7550e199670978047aa19 Mon Sep 17 00:00:00 2001
From: Alexandre <aperebaskine@ctgalega.com>
Date: Tue, 13 Jan 2026 09:57:11 +0100
Subject: [PATCH 2/3] fix: return type for
 is_item_name_customization_enabled_for_user

---
 pos_next/pos_next/doctype/pos_settings/pos_settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.py b/pos_next/pos_next/doctype/pos_settings/pos_settings.py
index 513abe66..dc51e920 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.py
+++ b/pos_next/pos_next/doctype/pos_settings/pos_settings.py
@@ -115,14 +115,14 @@ def get_pos_settings(pos_profile):
 	return settings
 
 
-def is_item_name_customization_enabled_for_user(pos_settings: str | dict) -> 0 | 1:
+def is_item_name_customization_enabled_for_user(pos_settings: str | dict) -> int:
 	"""
 	Returns whether the item name customization feature is enabled for the POS and whether the user is authorized to use it.
 	
 	:param pos_settings: The name of the POS Settings for the current point of sale
 	:type pos_settings: str | dict POS Settings name or dict
 	:return: 1 if item name customization is enabled and allowed for the user, else 0
-	:rtype: 0 | 1
+	:rtype: int
 	"""
 
 	if isinstance(pos_settings, str):

From 3cc2cae5ed7943a3b4713093e7ea7f6902e04109 Mon Sep 17 00:00:00 2001
From: Alexandre <aperebaskine@ctgalega.com>
Date: Tue, 13 Jan 2026 10:01:31 +0100
Subject: [PATCH 3/3] fix: trim edited item name on blur

---
 POS/src/components/sale/EditItemDialog.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/POS/src/components/sale/EditItemDialog.vue b/POS/src/components/sale/EditItemDialog.vue
index d986ec0a..253cfee0 100644
--- a/POS/src/components/sale/EditItemDialog.vue
+++ b/POS/src/components/sale/EditItemDialog.vue
@@ -234,7 +234,7 @@
 				<Button
 					variant="solid"
 					@click="updateItem"
-					:disabled="!hasStock || !localItemName || isCheckingStock"
+					:disabled="!hasStock || isItemNameEmpty || isCheckingStock"
 				>
 					<span v-if="isCheckingStock">{{ __('Checking Stock...') }}</span>
 					<span v-else-if="!hasStock">{{ __('No Stock Available') }}</span>
@@ -401,13 +401,17 @@ const isItemNameEditable = computed(() => {
 	return allowedForPOS && allowedForItem
 })
 
+const isItemNameEmpty = computed(() => !(localItemName.value.trim()))
+
 function restoreOriginalItemName() {
 	localItemName.value = originalItemName.value
 }
 
-function handleItemNameBlur() {
-	if (!localItemName.value) {
+function handleItemNameBlur() {	
+	if (isItemNameEmpty.value) {
 		restoreOriginalItemName()
+	} else {
+		localItemName.value = localItemName.value.trim()
 	}
 }
 
@@ -589,7 +593,7 @@ function updateItem() {
 			discountType.value === "amount" ? discountValue.value : 0,
 	}
 
-	if (settingsStore.allowCustomItemNameInCart) {
+	if (isItemNameEditable.value) {
 		updatedItem.item_name = localItemName.value || originalItemName.value
 	}