diff --git a/POS/src/components/settings/POSSettings.vue b/POS/src/components/settings/POSSettings.vue
index 89ca3e85..f4e7c4a3 100644
--- a/POS/src/components/settings/POSSettings.vue
+++ b/POS/src/components/settings/POSSettings.vue
@@ -8,21 +8,52 @@
 		>
 			<!-- Main Container -->
 			<div class="fixed inset-0 flex items-center justify-center p-4 md:p-6">
-				<div class="w-full max-w-5xl max-h-[90vh] bg-white rounded-xl shadow-2xl overflow-hidden flex flex-col">
+				<div
+					class="w-full max-w-5xl max-h-[90vh] bg-white rounded-xl shadow-2xl overflow-hidden flex flex-col"
+				>
 					<!-- Header -->
-					<div class="flex items-center justify-between px-6 py-5 border-b bg-gradient-to-r from-blue-50 to-indigo-50">
+					<div
+						class="flex items-center justify-between px-6 py-5 border-b bg-gradient-to-r from-blue-50 to-indigo-50"
+					>
 						<div class="flex items-center gap-3">
 							<div class="p-2 bg-blue-100 rounded-lg">
-								<svg class="w-6 h-6 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"/>
-									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
+								<svg
+									class="w-6 h-6 text-blue-600"
+									fill="none"
+									stroke="currentColor"
+									viewBox="0 0 24 24"
+								>
+									<path
+										stroke-linecap="round"
+										stroke-linejoin="round"
+										stroke-width="2"
+										d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
+									/>
+									<path
+										stroke-linecap="round"
+										stroke-linejoin="round"
+										stroke-width="2"
+										d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+									/>
 								</svg>
 							</div>
 							<div>
-								<h2 class="text-xl font-bold text-gray-900">{{ __('POS Settings') }}</h2>
+								<h2 class="text-xl font-bold text-gray-900">
+									{{ __("POS Settings") }}
+								</h2>
 								<p class="text-sm text-gray-600 flex items-center mt-0.5">
-									<svg class="w-4 h-4 me-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-										<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/>
+									<svg
+										class="w-4 h-4 me-1.5"
+										fill="none"
+										stroke="currentColor"
+										viewBox="0 0 24 24"
+									>
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											stroke-width="2"
+											d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
+										/>
 									</svg>
 									{{ settings.pos_profile || posProfile }}
 								</p>
@@ -36,11 +67,21 @@
 								size="sm"
 							>
 								<template #prefix>
-									<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-										<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+									<svg
+										class="w-4 h-4"
+										fill="none"
+										stroke="currentColor"
+										viewBox="0 0 24 24"
+									>
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											stroke-width="2"
+											d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+										/>
 									</svg>
 								</template>
-								{{ __('Refresh') }}
+								{{ __("Refresh") }}
 							</Button>
 							<Button
 								@click="saveSettings"
@@ -49,18 +90,38 @@
 								theme="blue"
 							>
 								<template #prefix>
-									<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-										<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"/>
+									<svg
+										class="w-4 h-4"
+										fill="none"
+										stroke="currentColor"
+										viewBox="0 0 24 24"
+									>
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											stroke-width="2"
+											d="M5 13l4 4L19 7"
+										/>
 									</svg>
 								</template>
-								{{ __('Save Changes') }}
+								{{ __("Save Changes") }}
 							</Button>
 							<button
 								@click="handleClose"
 								class="p-2 hover:bg-white/50 rounded-lg transition-colors"
 							>
-								<svg class="w-5 h-5 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-									<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
+								<svg
+									class="w-5 h-5 text-gray-600"
+									fill="none"
+									stroke="currentColor"
+									viewBox="0 0 24 24"
+								>
+									<path
+										stroke-linecap="round"
+										stroke-linejoin="round"
+										stroke-width="2"
+										d="M6 18L18 6M6 6l12 12"
+									/>
 								</svg>
 							</button>
 						</div>
@@ -69,49 +130,102 @@
 					<!-- Main Content -->
 					<div class="flex-1 overflow-y-auto bg-gray-50">
 						<!-- Loading State -->
-						<div v-if="loading" class="flex flex-col items-center justify-center py-16">
-							<div class="animate-spin rounded-full h-12 w-12 border-b-3 border-blue-500 mb-4"></div>
-							<p class="text-sm font-medium text-gray-600">{{ __('Loading settings...') }}</p>
+						<div
+							v-if="loading"
+							class="flex flex-col items-center justify-center py-16"
+						>
+							<div
+								class="animate-spin rounded-full h-12 w-12 border-b-3 border-blue-500 mb-4"
+							></div>
+							<p class="text-sm font-medium text-gray-600">
+								{{ __("Loading settings...") }}
+							</p>
 						</div>
 
 						<!-- Settings Form -->
-						<div v-else-if="settings.pos_profile || posProfile" class="p-6 flex flex-col gap-6">
+						<div
+							v-else-if="settings.pos_profile || posProfile"
+							class="p-6 flex flex-col gap-6"
+						>
 							<!-- Tabs Navigation -->
 							<div class="flex p-1 bg-gray-200 rounded-lg self-start">
 								<button
 									@click="activeTab = 'stock'"
-									:class="['px-4 py-2 text-sm font-medium rounded-md transition-all duration-200', activeTab === 'stock' ? 'bg-white text-gray-900 shadow-sm' : 'text-gray-600 hover:text-gray-900 hover:bg-gray-200/50']"
+									:class="[
+										'px-4 py-2 text-sm font-medium rounded-md transition-all duration-200',
+										activeTab === 'stock'
+											? 'bg-white text-gray-900 shadow-sm'
+											: 'text-gray-600 hover:text-gray-900 hover:bg-gray-200/50',
+									]"
 								>
-									{{ __('Stock Management') }}
+									{{ __("Stock Management") }}
 								</button>
 								<button
 									@click="activeTab = 'sales'"
-									:class="['px-4 py-2 text-sm font-medium rounded-md transition-all duration-200', activeTab === 'sales' ? 'bg-white text-gray-900 shadow-sm' : 'text-gray-600 hover:text-gray-900 hover:bg-gray-200/50']"
+									:class="[
+										'px-4 py-2 text-sm font-medium rounded-md transition-all duration-200',
+										activeTab === 'sales'
+											? 'bg-white text-gray-900 shadow-sm'
+											: 'text-gray-600 hover:text-gray-900 hover:bg-gray-200/50',
+									]"
 								>
-									{{ __('Sales Management') }}
+									{{ __("Sales Management") }}
 								</button>
 							</div>
 
 							<!-- Stock Settings Section - Prominent -->
-							<div v-if="activeTab === 'stock'" class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
+							<div
+								v-if="activeTab === 'stock'"
+								class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden"
+							>
 								<div :class="stockSectionClasses.header">
 									<div class="flex items-center justify-between">
 										<div class="flex items-center gap-3">
 											<div :class="stockSectionClasses.iconContainer">
-												<svg :class="stockSectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-													<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.warehouse"/>
+												<svg
+													:class="stockSectionClasses.icon"
+													fill="none"
+													stroke="currentColor"
+													viewBox="0 0 24 24"
+												>
+													<path
+														stroke-linecap="round"
+														stroke-linejoin="round"
+														stroke-width="2"
+														:d="icons.warehouse"
+													/>
 												</svg>
 											</div>
 											<div>
-												<h3 class="text-lg font-bold text-gray-900">{{ __('Stock Management') }}</h3>
-												<p class="text-xs text-gray-600 mt-0.5">{{ __('Configure warehouse and inventory settings') }}</p>
+												<h3 class="text-lg font-bold text-gray-900">
+													{{ __("Stock Management") }}
+												</h3>
+												<p class="text-xs text-gray-600 mt-0.5">
+													{{
+														__(
+															"Configure warehouse and inventory settings"
+														)
+													}}
+												</p>
 											</div>
 										</div>
 										<div :class="stockSectionClasses.badge">
-											<svg :class="stockSectionClasses.badgeIcon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.checkCircle"/>
+											<svg
+												:class="stockSectionClasses.badgeIcon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.checkCircle"
+												/>
 											</svg>
-											<span :class="stockSectionClasses.badgeText">{{ __('Stock Controls') }}</span>
+											<span :class="stockSectionClasses.badgeText">{{
+												__("Stock Controls")
+											}}</span>
 										</div>
 									</div>
 								</div>
@@ -119,49 +233,110 @@
 									<!-- Warehouse Selection -->
 									<div :class="warehouseSubsectionClasses.container">
 										<div class="flex items-center gap-2 mb-4">
-											<svg :class="warehouseSubsectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.location"/>
+											<svg
+												:class="warehouseSubsectionClasses.icon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.location"
+												/>
 											</svg>
-											<h4 class="text-sm font-semibold text-gray-900">{{ __('Warehouse Selection') }}</h4>
+											<h4 class="text-sm font-semibold text-gray-900">
+												{{ __("Warehouse Selection") }}
+											</h4>
 										</div>
-										<div v-if="warehouseOptions.length === 0" class="flex items-center p-4 bg-yellow-50 border border-yellow-200 rounded-lg">
-											<svg class="w-5 h-5 text-yellow-600 me-3 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.warning"/>
+										<div
+											v-if="warehouseOptions.length === 0"
+											class="flex items-center p-4 bg-yellow-50 border border-yellow-200 rounded-lg"
+										>
+											<svg
+												class="w-5 h-5 text-yellow-600 me-3 flex-shrink-0"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.warning"
+												/>
 											</svg>
-											<p class="text-sm text-yellow-800 font-medium">{{ __('Loading warehouses...') }}</p>
+											<p class="text-sm text-yellow-800 font-medium">
+												{{ __("Loading warehouses...") }}
+											</p>
 										</div>
 										<SelectField
 											v-else
 											v-model="selectedWarehouse"
 											:label="__('Active Warehouse')"
 											:options="warehouseOptions"
-											:description="__('All stock operations will use this warehouse. Stock quantities will refresh after saving.')"
+											:description="
+												__(
+													'All stock operations will use this warehouse. Stock quantities will refresh after saving.'
+												)
+											"
 										/>
 									</div>
 
 									<!-- Stock Policy Settings -->
 									<div :class="stockPolicySubsectionClasses.container">
 										<div class="flex items-center gap-2 mb-4">
-											<svg :class="stockPolicySubsectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.clipboard"/>
+											<svg
+												:class="stockPolicySubsectionClasses.icon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.clipboard"
+												/>
 											</svg>
-											<h4 class="text-sm font-semibold text-gray-900">{{ __('Stock Validation Policy') }}</h4>
+											<h4 class="text-sm font-semibold text-gray-900">
+												{{ __("Stock Validation Policy") }}
+											</h4>
 										</div>
 										<div class="flex flex-col gap-3">
 											<CheckboxField
 												v-model="settings.allow_negative_stock"
 												:label="__('Allow Negative Stock')"
-												:description="__('Enable selling items even when stock reaches zero or below. Integrates with Back Office stock settings.')"
+												:description="
+													__(
+														'Enable selling items even when stock reaches zero or below. Integrates with Back Office stock settings.'
+													)
+												"
 											/>
 											<div class="mt-3 p-3 bg-blue-100 rounded-md">
 												<div class="flex items-start gap-2">
-													<svg class="w-4 h-4 text-blue-600 mt-0.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-														<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.info"/>
+													<svg
+														class="w-4 h-4 text-blue-600 mt-0.5 flex-shrink-0"
+														fill="none"
+														stroke="currentColor"
+														viewBox="0 0 24 24"
+													>
+														<path
+															stroke-linecap="round"
+															stroke-linejoin="round"
+															stroke-width="2"
+															:d="icons.info"
+														/>
 													</svg>
-													<TranslatedHTML 
+													<TranslatedHTML
 														:tag="'p'"
-														class="text-xs text-blue-800 leading-relaxed" 
-														:inner="__('&lt;strong&gt;Note:&lt;strong&gt; When enabled, the system will allow sales even when stock quantity is zero or negative. This is useful for handling stock sync delays or backorders. All transactions are tracked in the stock ledger.')"
+														class="text-xs text-blue-800 leading-relaxed"
+														:inner="
+															__(
+																'&lt;strong&gt;Note:&lt;strong&gt; When enabled, the system will allow sales even when stock quantity is zero or negative. This is useful for handling stock sync delays or backorders. All transactions are tracked in the stock ledger.'
+															)
+														"
 													/>
 												</div>
 											</div>
@@ -171,17 +346,43 @@
 									<!-- Background Stock Sync Settings -->
 									<div :class="stockSyncSubsectionClasses.container">
 										<div class="flex items-center gap-2 mb-4">
-											<svg :class="stockSyncSubsectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+											<svg
+												:class="stockSyncSubsectionClasses.icon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+												/>
 											</svg>
-											<h4 class="text-sm font-semibold text-gray-900">{{ __('Background Stock Sync') }}</h4>
-											<div v-if="stockSyncStatus.enabled" class="ms-auto flex items-center px-2.5 py-1 bg-green-100 border border-green-300 rounded-full">
-												<div class="w-2 h-2 bg-green-500 rounded-full animate-pulse me-2"></div>
-												<span class="text-xs font-medium text-green-800">{{ __('Active') }}</span>
+											<h4 class="text-sm font-semibold text-gray-900">
+												{{ __("Background Stock Sync") }}
+											</h4>
+											<div
+												v-if="stockSyncStatus.enabled"
+												class="ms-auto flex items-center px-2.5 py-1 bg-green-100 border border-green-300 rounded-full"
+											>
+												<div
+													class="w-2 h-2 bg-green-500 rounded-full animate-pulse me-2"
+												></div>
+												<span class="text-xs font-medium text-green-800">{{
+													__("Active")
+												}}</span>
 											</div>
-											<div v-else class="ms-auto flex items-center px-2.5 py-1 bg-gray-100 border border-gray-300 rounded-full">
-												<div class="w-2 h-2 bg-gray-400 rounded-full me-2"></div>
-												<span class="text-xs font-medium text-gray-600">{{ __('Inactive') }}</span>
+											<div
+												v-else
+												class="ms-auto flex items-center px-2.5 py-1 bg-gray-100 border border-gray-300 rounded-full"
+											>
+												<div
+													class="w-2 h-2 bg-gray-400 rounded-full me-2"
+												></div>
+												<span class="text-xs font-medium text-gray-600">{{
+													__("Inactive")
+												}}</span>
 											</div>
 										</div>
 
@@ -190,63 +391,147 @@
 											<CheckboxField
 												v-model="stockSyncEnabled"
 												:label="__('Enable Automatic Stock Sync')"
-												:description="__('Periodically sync stock quantities from server in the background (runs in Web Worker)')"
+												:description="
+													__(
+														'Periodically sync stock quantities from server in the background (runs in Web Worker)'
+													)
+												"
 											/>
 
 											<!-- Sync Interval -->
-											<div v-if="stockSyncEnabled" class="ps-6 flex flex-col gap-3 border-s-2 border-blue-200">
+											<div
+												v-if="stockSyncEnabled"
+												class="ps-6 flex flex-col gap-3 border-s-2 border-blue-200"
+											>
 												<NumberField
 													v-model="stockSyncIntervalSeconds"
 													:label="__('Sync Interval (seconds)')"
-													:description="__('How often to check server for stock updates (minimum 10 seconds)')"
+													:description="
+														__(
+															'How often to check server for stock updates (minimum 10 seconds)'
+														)
+													"
 													:min="10"
 													:max="300"
 													:step="10"
 												/>
 
 												<!-- Sync Status Info -->
-												<div class="p-3 bg-blue-50 border border-blue-200 rounded-lg">
+												<div
+													class="p-3 bg-blue-50 border border-blue-200 rounded-lg"
+												>
 													<div class="flex items-start gap-2">
-														<svg class="w-4 h-4 text-blue-600 mt-0.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.info"/>
+														<svg
+															class="w-4 h-4 text-blue-600 mt-0.5 flex-shrink-0"
+															fill="none"
+															stroke="currentColor"
+															viewBox="0 0 24 24"
+														>
+															<path
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																:d="icons.info"
+															/>
 														</svg>
-														<div class="text-xs text-blue-800 flex flex-col gap-1">
-															<TranslatedHTML 
+														<div
+															class="text-xs text-blue-800 flex flex-col gap-1"
+														>
+															<TranslatedHTML
 																:tag="'p'"
-																:inner="stockSyncStatus.enabled 
-																	? __('&lt;strong&gt;Status:&lt;strong&gt; Running')
-																	: __('&lt;strong&gt;Status:&lt;strong&gt; Stopped')"
+																:inner="
+																	stockSyncStatus.enabled
+																		? __(
+																				'&lt;strong&gt;Status:&lt;strong&gt; Running'
+																		  )
+																		: __(
+																				'&lt;strong&gt;Status:&lt;strong&gt; Stopped'
+																		  )
+																"
 															/>
 															<TranslatedHTML
 																:tag="'p'"
-																:inner="__('&lt;strong&gt;Items Tracked:&lt;strong&gt; {0}', [stockSyncStatus.itemCount || 0])"
+																:inner="
+																	__(
+																		'&lt;strong&gt;Items Tracked:&lt;strong&gt; {0}',
+																		[
+																			stockSyncStatus.itemCount ||
+																				0,
+																		]
+																	)
+																"
 															/>
-															<TranslatedHTML 
+															<TranslatedHTML
 																:tag="'p'"
-																:inner="stockSyncStatus.warehouse
-																	? __('&lt;strong&gt;Warehouse:&lt;strong&gt; {0}', [stockSyncStatus.warehouse])
-																	: __('Warehouse not set')"
+																:inner="
+																	stockSyncStatus.warehouse
+																		? __(
+																				'&lt;strong&gt;Warehouse:&lt;strong&gt; {0}',
+																				[
+																					stockSyncStatus.warehouse,
+																				]
+																		  )
+																		: __('Warehouse not set')
+																"
 															/>
-															<TranslatedHTML 
+															<TranslatedHTML
 																:tag="'p'"
-																:inner="stockSyncStatus.lastSync
-																	? __('&lt;strong&gt;Last Sync:&lt;strong&gt; {0}', [formatSyncTime(stockSyncStatus.lastSync)]) 
-																	: __('&lt;strong&gt;Last Sync:&lt;strong&gt; Never')"
+																:inner="
+																	stockSyncStatus.lastSync
+																		? __(
+																				'&lt;strong&gt;Last Sync:&lt;strong&gt; {0}',
+																				[
+																					formatSyncTime(
+																						stockSyncStatus.lastSync
+																					),
+																				]
+																		  )
+																		: __(
+																				'&lt;strong&gt;Last Sync:&lt;strong&gt; Never'
+																		  )
+																"
 															/>
 														</div>
 													</div>
 												</div>
 
 												<!-- Network Usage Info -->
-												<div class="p-3 bg-gray-50 border border-gray-200 rounded-lg">
+												<div
+													class="p-3 bg-gray-50 border border-gray-200 rounded-lg"
+												>
 													<div class="flex items-start gap-2">
-														<svg class="w-4 h-4 text-gray-600 mt-0.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z"/>
+														<svg
+															class="w-4 h-4 text-gray-600 mt-0.5 flex-shrink-0"
+															fill="none"
+															stroke="currentColor"
+															viewBox="0 0 24 24"
+														>
+															<path
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																d="M13 10V3L4 14h7v7l9-11h-7z"
+															/>
 														</svg>
 														<div class="text-xs text-gray-700">
-															<p class="font-medium mb-1">{{ __('Network Usage:') }}</p>
-															<p>{{ __('~15 KB per sync cycle') }}</p>
-															<p>{{ __('~{0} MB per hour', [Math.round((3600 / stockSyncIntervalSeconds) * 15 / 1024)]) }}</p>
+															<p class="font-medium mb-1">
+																{{ __("Network Usage:") }}
+															</p>
+															<p>
+																{{ __("~15 KB per sync cycle") }}
+															</p>
+															<p>
+																{{
+																	__("~{0} MB per hour", [
+																		Math.round(
+																			((3600 /
+																				stockSyncIntervalSeconds) *
+																				15) /
+																				1024
+																		),
+																	])
+																}}
+															</p>
 														</div>
 													</div>
 												</div>
@@ -257,25 +542,58 @@
 							</div>
 
 							<!-- Sales Management Section - Prominent -->
-							<div v-if="activeTab === 'sales'" class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
+							<div
+								v-if="activeTab === 'sales'"
+								class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden"
+							>
 								<div :class="salesSectionClasses.header">
 									<div class="flex items-center justify-between">
 										<div class="flex items-center gap-3">
 											<div :class="salesSectionClasses.iconContainer">
-												<svg :class="salesSectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-													<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.shoppingCart"/>
+												<svg
+													:class="salesSectionClasses.icon"
+													fill="none"
+													stroke="currentColor"
+													viewBox="0 0 24 24"
+												>
+													<path
+														stroke-linecap="round"
+														stroke-linejoin="round"
+														stroke-width="2"
+														:d="icons.shoppingCart"
+													/>
 												</svg>
 											</div>
 											<div>
-												<h3 class="text-lg font-bold text-gray-900">{{ __('Sales Management') }}</h3>
-												<p class="text-xs text-gray-600 mt-0.5">{{ __('Configure pricing, discounts, and sales operations') }}</p>
+												<h3 class="text-lg font-bold text-gray-900">
+													{{ __("Sales Management") }}
+												</h3>
+												<p class="text-xs text-gray-600 mt-0.5">
+													{{
+														__(
+															"Configure pricing, discounts, and sales operations"
+														)
+													}}
+												</p>
 											</div>
 										</div>
 										<div :class="salesSectionClasses.badge">
-											<svg :class="salesSectionClasses.badgeIcon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.currency"/>
+											<svg
+												:class="salesSectionClasses.badgeIcon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.currency"
+												/>
 											</svg>
-											<span :class="salesSectionClasses.badgeText">{{ __('Sales Controls') }}</span>
+											<span :class="salesSectionClasses.badgeText">{{
+												__("Sales Controls")
+											}}</span>
 										</div>
 									</div>
 								</div>
@@ -283,16 +601,32 @@
 									<!-- Pricing & Discounts -->
 									<div :class="pricingSubsectionClasses.container">
 										<div class="flex items-center gap-2 mb-4">
-											<svg :class="pricingSubsectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.tag"/>
+											<svg
+												:class="pricingSubsectionClasses.icon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.tag"
+												/>
 											</svg>
-											<h4 class="text-sm font-semibold text-gray-900">{{ __('Pricing & Discounts') }}</h4>
+											<h4 class="text-sm font-semibold text-gray-900">
+												{{ __("Pricing & Discounts") }}
+											</h4>
 										</div>
 										<div class="flex flex-col gap-3">
 											<CheckboxField
 												v-model="settings.tax_inclusive"
 												:label="__('Tax Inclusive')"
-												:description="__('When enabled, displayed prices include tax. When disabled, tax is calculated separately. Changes apply immediately to your cart when you save.')"
+												:description="
+													__(
+														'When enabled, displayed prices include tax. When disabled, tax is calculated separately. Changes apply immediately to your cart when you save.'
+													)
+												"
 											/>
 											<NumberField
 												v-model="settings.max_discount_allowed"
@@ -307,24 +641,34 @@
 												:description="__('Show discounts as percentages')"
 											/>
 											<CheckboxField
-												v-model="settings.allow_user_to_edit_additional_discount"
+												v-model="
+													settings.allow_user_to_edit_additional_discount
+												"
 												:label="__('Allow Additional Discount')"
 												:description="__('Enable invoice-level discount')"
 											/>
 											<CheckboxField
 												v-model="settings.allow_user_to_edit_item_discount"
 												:label="__('Allow Item Discount')"
-												:description="__('Enable item-level discount in edit dialog')"
+												:description="
+													__('Enable item-level discount in edit dialog')
+												"
 											/>
 											<CheckboxField
 												v-model="settings.allow_user_to_edit_rate"
 												:label="__('Allow User To Edit Rate')"
-												:description="__('Allow editing item rate in cart. Disabled when offers are applied.')"
+												:description="
+													__(
+														'Allow editing item rate in cart. Disabled when offers are applied.'
+													)
+												"
 											/>
 											<CheckboxField
 												v-model="settings.disable_rounded_total"
 												:label="__('Disable Rounded Total')"
-												:description="__('Show exact totals without rounding')"
+												:description="
+													__('Show exact totals without rounding')
+												"
 											/>
 										</div>
 									</div>
@@ -332,10 +676,22 @@
 									<!-- Sales Operations -->
 									<div :class="operationsSubsectionClasses.container">
 										<div class="flex items-center gap-2 mb-4">
-											<svg :class="operationsSubsectionClasses.icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-												<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" :d="icons.checkCircle"/>
+											<svg
+												:class="operationsSubsectionClasses.icon"
+												fill="none"
+												stroke="currentColor"
+												viewBox="0 0 24 24"
+											>
+												<path
+													stroke-linecap="round"
+													stroke-linejoin="round"
+													stroke-width="2"
+													:d="icons.checkCircle"
+												/>
 											</svg>
-											<h4 class="text-sm font-semibold text-gray-900">{{ __('Sales Operations') }}</h4>
+											<h4 class="text-sm font-semibold text-gray-900">
+												{{ __("Sales Operations") }}
+											</h4>
 										</div>
 										<div class="flex flex-col gap-3">
 											<CheckboxField
@@ -356,34 +712,61 @@
 											<CheckboxField
 												v-model="settings.allow_partial_payment"
 												:label="__('Allow Partial Payment')"
-												:description="__('Enable partial payment for invoices')"
+												:description="
+													__('Enable partial payment for invoices')
+												"
 											/>
 											<CheckboxField
 												v-model="settings.silent_print"
 												:label="__('Silent Print')"
-												:description="__('Send receipts directly to a thermal printer via QZ Tray (no browser dialog)')"
+												:description="
+													__(
+														'Send receipts directly to a thermal printer via QZ Tray (no browser dialog)'
+													)
+												"
 											/>
 
 											<!-- QZ Tray Printer Settings (shown when silent print is enabled) -->
-											<div v-if="settings.silent_print" class="ps-6 flex flex-col gap-3 border-s-2 border-teal-200">
+											<div
+												v-if="settings.silent_print"
+												class="ps-6 flex flex-col gap-3 border-s-2 border-teal-200"
+											>
 												<!-- Connection Status -->
 												<div class="flex items-center gap-2">
 													<div
 														class="w-2.5 h-2.5 rounded-full flex-shrink-0"
-														:class="qzConnecting ? 'bg-yellow-500 animate-pulse' : qzConnected ? 'bg-green-500' : 'bg-red-500'"
+														:class="
+															qzConnecting
+																? 'bg-yellow-500 animate-pulse'
+																: qzConnected
+																? 'bg-green-500'
+																: 'bg-red-500'
+														"
 													></div>
 													<span
 														class="text-xs font-medium"
-														:class="qzConnecting ? 'text-yellow-700' : qzConnected ? 'text-green-700' : 'text-red-700'"
+														:class="
+															qzConnecting
+																? 'text-yellow-700'
+																: qzConnected
+																? 'text-green-700'
+																: 'text-red-700'
+														"
 													>
-														{{ qzConnecting ? __('Connecting to QZ Tray...') : qzConnected ? __('QZ Tray Connected') : __('QZ Tray Not Connected') }}
+														{{
+															qzConnecting
+																? __("Connecting to QZ Tray...")
+																: qzConnected
+																? __("QZ Tray Connected")
+																: __("QZ Tray Not Connected")
+														}}
 													</span>
 													<button
 														v-if="!qzConnected && !qzConnecting"
 														@click="handleQzConnect"
 														class="ms-auto text-xs px-2 py-1 bg-blue-100 hover:bg-blue-200 text-blue-700 rounded transition-colors"
 													>
-														{{ __('Retry') }}
+														{{ __("Retry") }}
 													</button>
 												</div>
 
@@ -394,7 +777,14 @@
 															v-model="selectedPrinter"
 															:label="__('Printer')"
 															:options="printerOptions"
-															:description="qzPrinters.length === 0 && !loadingPrinters ? __('No printers found. Is QZ Tray running?') : ''"
+															:description="
+																qzPrinters.length === 0 &&
+																!loadingPrinters
+																	? __(
+																			'No printers found. Is QZ Tray running?'
+																	  )
+																	: ''
+															"
 														/>
 													</div>
 													<button
@@ -405,10 +795,21 @@
 													>
 														<svg
 															class="w-4 h-4 text-gray-600"
-															:class="loadingPrinters ? 'animate-spin' : ''"
-															fill="none" stroke="currentColor" viewBox="0 0 24 24"
+															:class="
+																loadingPrinters
+																	? 'animate-spin'
+																	: ''
+															"
+															fill="none"
+															stroke="currentColor"
+															viewBox="0 0 24 24"
 														>
-															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+															<path
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+															/>
 														</svg>
 													</button>
 												</div>
@@ -420,49 +821,108 @@
 														qzCertStatus === 'trusted'
 															? 'bg-green-50 border-green-200'
 															: qzCertStatus === 'untrusted'
-																? 'bg-red-50 border-red-200'
-																: 'bg-amber-50 border-amber-200'
+															? 'bg-red-50 border-red-200'
+															: 'bg-amber-50 border-amber-200',
 													]"
 												>
 													<div class="flex items-start gap-2">
 														<!-- Icon changes based on status -->
 														<svg
 															class="w-4 h-4 mt-0.5 flex-shrink-0"
-															:class="qzCertStatus === 'trusted' ? 'text-green-600' : qzCertStatus === 'untrusted' ? 'text-red-600' : 'text-amber-600'"
-															fill="none" stroke="currentColor" viewBox="0 0 24 24"
+															:class="
+																qzCertStatus === 'trusted'
+																	? 'text-green-600'
+																	: qzCertStatus === 'untrusted'
+																	? 'text-red-600'
+																	: 'text-amber-600'
+															"
+															fill="none"
+															stroke="currentColor"
+															viewBox="0 0 24 24"
 														>
-															<path v-if="qzCertStatus === 'trusted'" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"/>
-															<path v-else stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"/>
+															<path
+																v-if="qzCertStatus === 'trusted'"
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"
+															/>
+															<path
+																v-else
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
+															/>
 														</svg>
 														<div class="flex-1">
 															<!-- Title with inline status badge -->
-															<div class="flex items-center gap-2 mb-1">
+															<div
+																class="flex items-center gap-2 mb-1"
+															>
 																<p
 																	class="text-xs font-semibold"
-																	:class="qzCertStatus === 'trusted' ? 'text-green-900' : qzCertStatus === 'untrusted' ? 'text-red-900' : 'text-amber-900'"
+																	:class="
+																		qzCertStatus === 'trusted'
+																			? 'text-green-900'
+																			: qzCertStatus ===
+																			  'untrusted'
+																			? 'text-red-900'
+																			: 'text-amber-900'
+																	"
 																>
-																	{{ __('Silent Print Certificate') }}
+																	{{
+																		__(
+																			"Silent Print Certificate"
+																		)
+																	}}
 																</p>
 																<span
-																	v-if="qzCertStatus === 'trusted'"
+																	v-if="
+																		qzCertStatus === 'trusted'
+																	"
 																	class="inline-flex items-center gap-1 px-1.5 py-0.5 bg-green-100 border border-green-300 rounded-full"
 																>
-																	<span class="w-1.5 h-1.5 bg-green-500 rounded-full"></span>
-																	<span class="text-[10px] font-medium text-green-800">{{ __('Installed') }}</span>
+																	<span
+																		class="w-1.5 h-1.5 bg-green-500 rounded-full"
+																	></span>
+																	<span
+																		class="text-[10px] font-medium text-green-800"
+																		>{{
+																			__("Installed")
+																		}}</span
+																	>
 																</span>
 																<span
-																	v-else-if="qzCertStatus === 'untrusted'"
+																	v-else-if="
+																		qzCertStatus ===
+																		'untrusted'
+																	"
 																	class="inline-flex items-center gap-1 px-1.5 py-0.5 bg-red-100 border border-red-300 rounded-full"
 																>
-																	<span class="w-1.5 h-1.5 bg-red-500 rounded-full"></span>
-																	<span class="text-[10px] font-medium text-red-800">{{ __('Not Installed') }}</span>
+																	<span
+																		class="w-1.5 h-1.5 bg-red-500 rounded-full"
+																	></span>
+																	<span
+																		class="text-[10px] font-medium text-red-800"
+																		>{{
+																			__("Not Installed")
+																		}}</span
+																	>
 																</span>
 																<span
 																	v-else
 																	class="inline-flex items-center gap-1 px-1.5 py-0.5 bg-amber-100 border border-amber-300 rounded-full"
 																>
-																	<span class="w-1.5 h-1.5 bg-amber-500 rounded-full"></span>
-																	<span class="text-[10px] font-medium text-amber-800">{{ __('Checking...') }}</span>
+																	<span
+																		class="w-1.5 h-1.5 bg-amber-500 rounded-full"
+																	></span>
+																	<span
+																		class="text-[10px] font-medium text-amber-800"
+																		>{{
+																			__("Checking...")
+																		}}</span
+																	>
 																</span>
 															</div>
 
@@ -471,70 +931,173 @@
 																v-if="qzCertStatus === 'trusted'"
 																class="text-xs text-green-800 leading-relaxed mb-2"
 															>
-																{{ __('Certificate is installed and signing is active. Print jobs will be sent silently without confirmation dialogs.') }}
+																{{
+																	__(
+																		"Certificate is installed and signing is active. Print jobs will be sent silently without confirmation dialogs."
+																	)
+																}}
 															</p>
 															<p
-																v-else-if="qzCertStatus === 'untrusted'"
+																v-else-if="
+																	qzCertStatus === 'untrusted'
+																"
 																class="text-xs text-red-800 leading-relaxed mb-2"
 															>
-																{{ __('Certificate is not installed on this machine. Generate a certificate, download it, and import it into QZ Tray.') }}
+																{{
+																	__(
+																		"Certificate is not installed on this machine. Generate a certificate, download it, and import it into QZ Tray."
+																	)
+																}}
 															</p>
 															<p
 																v-else
 																class="text-xs text-amber-800 leading-relaxed mb-2"
 															>
-																{{ __('To print without confirmation dialogs, generate a signing certificate and install it on each POS machine.') }}
+																{{
+																	__(
+																		"To print without confirmation dialogs, generate a signing certificate and install it on each POS machine."
+																	)
+																}}
 															</p>
 
 															<!-- Action buttons -->
-															<div class="flex items-center gap-2 flex-wrap">
+															<div
+																class="flex items-center gap-2 flex-wrap"
+															>
 																<button
-																	v-if="qzCertStatus !== 'trusted'"
-																	@click="handleSetupQzCertificate"
+																	v-if="
+																		qzCertStatus !== 'trusted'
+																	"
+																	@click="
+																		handleSetupQzCertificate
+																	"
 																	:disabled="qzCertLoading"
 																	class="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium text-white rounded-md transition-colors bg-amber-600 hover:bg-amber-700 disabled:bg-amber-400"
 																>
-																	<svg v-if="qzCertLoading" class="w-3.5 h-3.5 animate-spin" fill="none" viewBox="0 0 24 24">
-																		<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"/>
-																		<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"/>
+																	<svg
+																		v-if="qzCertLoading"
+																		class="w-3.5 h-3.5 animate-spin"
+																		fill="none"
+																		viewBox="0 0 24 24"
+																	>
+																		<circle
+																			class="opacity-25"
+																			cx="12"
+																			cy="12"
+																			r="10"
+																			stroke="currentColor"
+																			stroke-width="4"
+																		/>
+																		<path
+																			class="opacity-75"
+																			fill="currentColor"
+																			d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"
+																		/>
 																	</svg>
-																	<svg v-else class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-																		<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"/>
+																	<svg
+																		v-else
+																		class="w-3.5 h-3.5"
+																		fill="none"
+																		stroke="currentColor"
+																		viewBox="0 0 24 24"
+																	>
+																		<path
+																			stroke-linecap="round"
+																			stroke-linejoin="round"
+																			stroke-width="2"
+																			d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"
+																		/>
 																	</svg>
-																	{{ __('Generate Certificate') }}
+																	{{
+																		__("Generate Certificate")
+																	}}
 																</button>
 																<button
 																	v-if="qzCertReady"
-																	@click="handleDownloadQzCertificate"
+																	@click="
+																		handleDownloadQzCertificate
+																	"
 																	class="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium bg-blue-600 hover:bg-blue-700 text-white rounded-md transition-colors"
 																>
-																	<svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-																		<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"/>
+																	<svg
+																		class="w-3.5 h-3.5"
+																		fill="none"
+																		stroke="currentColor"
+																		viewBox="0 0 24 24"
+																	>
+																		<path
+																			stroke-linecap="round"
+																			stroke-linejoin="round"
+																			stroke-width="2"
+																			d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
+																		/>
 																	</svg>
-																	{{ __('Download Certificate') }}
+																	{{
+																		__("Download Certificate")
+																	}}
 																</button>
 															</div>
 
 															<!-- Install instructions (only when cert exists but not trusted yet) -->
-															<p v-if="qzCertReady && qzCertStatus !== 'trusted'" class="text-xs mt-2"
-																:class="qzCertStatus === 'untrusted' ? 'text-red-700' : 'text-amber-700'"
+															<p
+																v-if="
+																	qzCertReady &&
+																	qzCertStatus !== 'trusted'
+																"
+																class="text-xs mt-2"
+																:class="
+																	qzCertStatus === 'untrusted'
+																		? 'text-red-700'
+																		: 'text-amber-700'
+																"
 															>
-																{{ __('Download the certificate and import it into QZ Tray, then restart QZ Tray.') }}
+																{{
+																	__(
+																		"Download the certificate and import it into QZ Tray, then restart QZ Tray."
+																	)
+																}}
 															</p>
 														</div>
 													</div>
 												</div>
 
 												<!-- Help text -->
-												<div class="p-3 bg-teal-50 border border-teal-200 rounded-lg">
+												<div
+													class="p-3 bg-teal-50 border border-teal-200 rounded-lg"
+												>
 													<div class="flex items-start gap-2">
-														<svg class="w-4 h-4 text-teal-600 mt-0.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/>
+														<svg
+															class="w-4 h-4 text-teal-600 mt-0.5 flex-shrink-0"
+															fill="none"
+															stroke="currentColor"
+															viewBox="0 0 24 24"
+														>
+															<path
+																stroke-linecap="round"
+																stroke-linejoin="round"
+																stroke-width="2"
+																d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+															/>
 														</svg>
-														<p class="text-xs text-teal-800 leading-relaxed">
-															{{ __('QZ Tray must be installed and running on this computer. Download from') }}
-															<a href="https://qz.io/download/" target="_blank" class="font-semibold underline">qz.io</a>.
-															{{ __('If QZ Tray is unavailable, printing will fall back to the browser dialog.') }}
+														<p
+															class="text-xs text-teal-800 leading-relaxed"
+														>
+															{{
+																__(
+																	"QZ Tray must be installed and running on this computer. Download from"
+																)
+															}}
+															<a
+																href="https://qz.io/download/"
+																target="_blank"
+																class="font-semibold underline"
+																>qz.io</a
+															>.
+															{{
+																__(
+																	"If QZ Tray is unavailable, printing will fall back to the browser dialog."
+																)
+															}}
 														</p>
 													</div>
 												</div>
@@ -543,17 +1106,38 @@
 									</div>
 								</div>
 							</div>
-
 						</div>
 
 						<!-- Empty State -->
-						<div v-else class="flex flex-col items-center justify-center py-16 text-center">
-							<svg class="w-16 h-16 text-gray-400 mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-								<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"/>
-								<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
+						<div
+							v-else
+							class="flex flex-col items-center justify-center py-16 text-center"
+						>
+							<svg
+								class="w-16 h-16 text-gray-400 mb-4"
+								fill="none"
+								stroke="currentColor"
+								viewBox="0 0 24 24"
+							>
+								<path
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									stroke-width="2"
+									d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
+								/>
+								<path
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									stroke-width="2"
+									d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+								/>
 							</svg>
-							<p class="text-gray-600 font-medium">{{ __('No POS Profile Selected') }}</p>
-							<p class="text-gray-500 text-sm mt-1">{{ __('Please select a POS Profile to configure settings') }}</p>
+							<p class="text-gray-600 font-medium">
+								{{ __("No POS Profile Selected") }}
+							</p>
+							<p class="text-gray-500 text-sm mt-1">
+								{{ __("Please select a POS Profile to configure settings") }}
+							</p>
 						</div>
 					</div>
 				</div>
@@ -563,43 +1147,39 @@
 </template>
 
 <script setup>
-import CheckboxField from "@/components/settings/CheckboxField.vue"
-import NumberField from "@/components/settings/NumberField.vue"
-import SelectField from "@/components/settings/SelectField.vue"
-import { useToast } from "@/composables/useToast"
-import { Button, call, createResource } from "frappe-ui"
-import { computed, onMounted, onUnmounted, ref, watch } from "vue"
-import {
-	getSectionHeaderClasses,
-	getSubsectionClasses,
-	icons,
-} from "./settingsConfig"
-import { offlineWorker } from "@/utils/offline/workerClient"
-import { logger } from "@/utils/logger"
-import { usePOSEvents } from "@/composables/usePOSEvents"
-import TranslatedHTML from "../common/TranslatedHTML.vue"
-import { useQzTray } from "@/composables/useQzTray"
-
-const log = logger.create('POSSettings')
-const { detectSettingsChanges, updateSettingsSnapshot, emitStockSyncConfigured } = usePOSEvents()
-const { showSuccess, showError } = useToast()
+import CheckboxField from "@/components/settings/CheckboxField.vue";
+import NumberField from "@/components/settings/NumberField.vue";
+import SelectField from "@/components/settings/SelectField.vue";
+import { useToast } from "@/composables/useToast";
+import { Button, call, createResource } from "frappe-ui";
+import { computed, onMounted, onUnmounted, ref, watch } from "vue";
+import { getSectionHeaderClasses, getSubsectionClasses, icons } from "./settingsConfig";
+import { offlineWorker } from "@/utils/offline/workerClient";
+import { logger } from "@/utils/logger";
+import { usePOSEvents } from "@/composables/usePOSEvents";
+import TranslatedHTML from "../common/TranslatedHTML.vue";
+import { useQzTray } from "@/composables/useQzTray";
+
+const log = logger.create("POSSettings");
+const { detectSettingsChanges, updateSettingsSnapshot, emitStockSyncConfigured } = usePOSEvents();
+const { showSuccess, showError } = useToast();
 
 const props = defineProps({
 	modelValue: Boolean,
 	posProfile: String,
 	currentWarehouse: String,
-})
+});
 
-const emit = defineEmits(["update:modelValue"])
+const emit = defineEmits(["update:modelValue"]);
 
-const show = ref(props.modelValue)
+const show = ref(props.modelValue);
 
 // State
-const activeTab = ref('stock')
-const loading = ref(true)
-const saving = ref(false)
-const warehousesList = ref([])
-const selectedWarehouse = ref(props.currentWarehouse || "")
+const activeTab = ref("stock");
+const loading = ref(true);
+const saving = ref(false);
+const warehousesList = ref([]);
+const selectedWarehouse = ref(props.currentWarehouse || "");
 const settings = ref({
 	pos_profile: props.posProfile || "",
 	enabled: 1,
@@ -617,19 +1197,19 @@ const settings = ref({
 	silent_print: 0,
 	allow_negative_stock: 0,
 	tax_inclusive: 0,
-})
+});
 
 // Stock Sync Settings (localStorage persisted)
-const stockSyncEnabled = ref(false)
-const stockSyncIntervalSeconds = ref(60) // Default 60 seconds
+const stockSyncEnabled = ref(false);
+const stockSyncIntervalSeconds = ref(60); // Default 60 seconds
 const stockSyncStatus = ref({
 	enabled: false,
 	warehouse: null,
 	itemCount: 0,
 	intervalMs: 60000,
 	lastSync: null,
-	running: false
-})
+	running: false,
+});
 
 // QZ Tray composable
 const {
@@ -646,27 +1226,25 @@ const {
 	refreshPrinters: handleRefreshPrinters,
 	generateCertificate: handleSetupQzCertificate,
 	downloadCertificate: handleDownloadQzCertificate,
-} = useQzTray()
+} = useQzTray();
 
 // Warehouse options
 const warehouseOptions = computed(() => {
-	if (warehousesList.value.length === 0) return []
+	if (warehousesList.value.length === 0) return [];
 	return warehousesList.value.map((w) => ({
 		label: w.warehouse_name || w.name,
 		value: w.name,
-	}))
-})
+	}));
+});
 
 // Dynamic classes using configuration helpers (DRY principle)
-const stockSectionClasses = computed(() => getSectionHeaderClasses("purple"))
-const salesSectionClasses = computed(() => getSectionHeaderClasses("green"))
-const warehouseSubsectionClasses = computed(() => getSubsectionClasses("gray"))
-const stockPolicySubsectionClasses = computed(() =>
-	getSubsectionClasses("blue"),
-)
-const stockSyncSubsectionClasses = computed(() => getSubsectionClasses("indigo"))
-const pricingSubsectionClasses = computed(() => getSubsectionClasses("emerald"))
-const operationsSubsectionClasses = computed(() => getSubsectionClasses("teal"))
+const stockSectionClasses = computed(() => getSectionHeaderClasses("purple"));
+const salesSectionClasses = computed(() => getSectionHeaderClasses("green"));
+const warehouseSubsectionClasses = computed(() => getSubsectionClasses("gray"));
+const stockPolicySubsectionClasses = computed(() => getSubsectionClasses("blue"));
+const stockSyncSubsectionClasses = computed(() => getSubsectionClasses("indigo"));
+const pricingSubsectionClasses = computed(() => getSubsectionClasses("emerald"));
+const operationsSubsectionClasses = computed(() => getSubsectionClasses("teal"));
 
 // Resources
 const warehousesResource = createResource({
@@ -674,180 +1252,177 @@ const warehousesResource = createResource({
 	makeParams() {
 		return {
 			pos_profile: props.posProfile,
-		}
+		};
 	},
 	auto: false,
 	onSuccess(data) {
-		const warehouses = data?.message || data || []
-		warehousesList.value = warehouses
+		const warehouses = data?.message || data || [];
+		warehousesList.value = warehouses;
 	},
 	onError(error) {
-		warehousesList.value = []
+		warehousesList.value = [];
 	},
-})
+});
 
 // Track original allow_negative_stock value for detecting changes
-const originalAllowNegativeStock = ref(null)
+const originalAllowNegativeStock = ref(null);
 
 const settingsResource = createResource({
-	url: "pos_next.pos_next.doctype.pos_settings.pos_settings.get_pos_settings",
+	url: "pos_next.pos_next.doctype.pos_next_settings.pos_next_settings.get_pos_settings",
 	makeParams() {
 		return {
 			pos_profile: props.posProfile,
-		}
+		};
 	},
 	onSuccess(data) {
 		if (data) {
-			Object.assign(settings.value, data)
-			settings.value.pos_profile = props.posProfile
+			Object.assign(settings.value, data);
+			settings.value.pos_profile = props.posProfile;
 			// Store original value
-			originalAllowNegativeStock.value = data.allow_negative_stock
+			originalAllowNegativeStock.value = data.allow_negative_stock;
 			// Update event system snapshot
-			updateSettingsSnapshot(settings.value)
+			updateSettingsSnapshot(settings.value);
 		}
-		loading.value = false
+		loading.value = false;
 	},
 	onError(error) {
-		loading.value = false
-		showError(__("Failed to load settings"))
+		loading.value = false;
+		showError(__("Failed to load settings"));
 	},
-})
+});
 
 // Watchers
 watch(
 	() => props.modelValue,
 	(val) => {
-		show.value = val
+		show.value = val;
 		if (val) {
-			loadSettings()
+			loadSettings();
 		}
-	},
-)
+	}
+);
 
 watch(show, (val) => {
-	emit("update:modelValue", val)
-})
+	emit("update:modelValue", val);
+});
 
 // Watch for currentWarehouse prop changes and always sync
 watch(
 	() => props.currentWarehouse,
 	(newWarehouse) => {
 		if (newWarehouse) {
-			selectedWarehouse.value = newWarehouse
+			selectedWarehouse.value = newWarehouse;
 		}
 	},
-	{ immediate: true },
-)
+	{ immediate: true }
+);
 
 // Watch for tax_inclusive changes to provide immediate feedback
-const originalTaxInclusive = ref(null)
+const originalTaxInclusive = ref(null);
 watch(
 	() => settings.value.tax_inclusive,
 	(newValue, oldValue) => {
 		// Store original value on first load
 		if (originalTaxInclusive.value === null && oldValue !== undefined) {
-			originalTaxInclusive.value = oldValue
+			originalTaxInclusive.value = oldValue;
 		}
 
 		// Only show feedback if value actually changed from original
 		if (originalTaxInclusive.value !== null && newValue !== originalTaxInclusive.value) {
-			const mode = newValue ? 'inclusive' : 'exclusive'
-			log.info(`Tax mode toggled to: ${mode}`)
+			const mode = newValue ? "inclusive" : "exclusive";
+			log.info(`Tax mode toggled to: ${mode}`);
 		}
 	}
-)
+);
 
 // Methods
 function handleClose() {
-	show.value = false
+	show.value = false;
 }
 
 async function loadSettings() {
-	if (!props.posProfile) return
-	loading.value = true
-	settings.value.pos_profile = props.posProfile
+	if (!props.posProfile) return;
+	loading.value = true;
+	settings.value.pos_profile = props.posProfile;
 
 	// Always set the current warehouse from props (from current shift/profile)
-	selectedWarehouse.value = props.currentWarehouse || ""
+	selectedWarehouse.value = props.currentWarehouse || "";
 
 	try {
 		// Load warehouses first using call API directly
-		const warehousesData = await call(
-			"pos_next.api.pos_profile.get_warehouses",
-			{
-				pos_profile: props.posProfile,
-			},
-		)
+		const warehousesData = await call("pos_next.api.pos_profile.get_warehouses", {
+			pos_profile: props.posProfile,
+		});
 
 		// Handle frappe-ui call response format { message: [...] }
-		warehousesList.value = warehousesData?.message || warehousesData || []
+		warehousesList.value = warehousesData?.message || warehousesData || [];
 
 		// Load settings
-		settingsResource.reload()
+		settingsResource.reload();
 	} catch (error) {
-		log.error("Error loading warehouses:", error)
-		warehousesList.value = []
+		log.error("Error loading warehouses:", error);
+		warehousesList.value = [];
 		// Still load settings even if warehouses fail
-		settingsResource.reload()
+		settingsResource.reload();
 	}
 }
 
 async function saveSettings() {
 	if (!props.posProfile) {
-		showError(__("POS Profile not found"))
-		return
+		showError(__("POS Profile not found"));
+		return;
 	}
 
-	saving.value = true
-	const oldWarehouse = props.currentWarehouse
-	const warehouseChanged = selectedWarehouse.value !== oldWarehouse
-	const negativeStockChanged = originalAllowNegativeStock.value !== settings.value.allow_negative_stock
-	const taxInclusiveChanged = originalTaxInclusive.value !== null && originalTaxInclusive.value !== settings.value.tax_inclusive
+	saving.value = true;
+	const oldWarehouse = props.currentWarehouse;
+	const warehouseChanged = selectedWarehouse.value !== oldWarehouse;
+	const negativeStockChanged =
+		originalAllowNegativeStock.value !== settings.value.allow_negative_stock;
+	const taxInclusiveChanged =
+		originalTaxInclusive.value !== null &&
+		originalTaxInclusive.value !== settings.value.tax_inclusive;
 
 	// Capture old settings for change detection
 	const oldSettings = {
 		...settings.value,
-		warehouse: oldWarehouse // Include warehouse in change detection
-	}
+		warehouse: oldWarehouse, // Include warehouse in change detection
+	};
 
 	try {
 		// Save POS Settings (without warehouse)
 		const result = await call(
-			"pos_next.pos_next.doctype.pos_settings.pos_settings.update_pos_settings",
+			"pos_next.pos_next.doctype.pos_next_settings.pos_next_settings.update_pos_settings",
 			{
 				pos_profile: props.posProfile,
 				settings: settings.value,
-			},
-		)
+			}
+		);
 
 		if (result) {
-			Object.assign(settings.value, result)
-			settings.value.pos_profile = props.posProfile
+			Object.assign(settings.value, result);
+			settings.value.pos_profile = props.posProfile;
 			// Update original values after successful save
-			originalAllowNegativeStock.value = result.allow_negative_stock
-			originalTaxInclusive.value = result.tax_inclusive
+			originalAllowNegativeStock.value = result.allow_negative_stock;
+			originalTaxInclusive.value = result.tax_inclusive;
 		}
 
 		// Update warehouse in POS Profile if changed
 		if (warehouseChanged && selectedWarehouse.value) {
-			const warehouseResult = await call(
-				"pos_next.api.pos_profile.update_warehouse",
-				{
-					pos_profile: props.posProfile,
-					warehouse: selectedWarehouse.value,
-				},
-			)
+			const warehouseResult = await call("pos_next.api.pos_profile.update_warehouse", {
+				pos_profile: props.posProfile,
+				warehouse: selectedWarehouse.value,
+			});
 
 			if (warehouseResult && warehouseResult.success) {
 				// Add warehouse to new settings for change detection
 				// (detectSettingsChanges below will emit settings:warehouse-changed via event bus)
-				settings.value.warehouse = selectedWarehouse.value
+				settings.value.warehouse = selectedWarehouse.value;
 			}
 		}
 
 		// Detect and emit settings changes through event system
 		// This will notify all listeners (POSSale, stock store, cart store, etc.)
-		detectSettingsChanges(settings.value, oldSettings)
+		detectSettingsChanges(settings.value, oldSettings);
 
 		// IMPORTANT: Page reload for critical stock policy change
 		// The allow_negative_stock setting affects deep stock validation logic
@@ -859,29 +1434,31 @@ async function saveSettings() {
 		// prevents inconsistent state. Event listeners are still notified
 		// before reload for any cleanup needed.
 		if (negativeStockChanged) {
-			log.info("Stock policy changed, reloading page for consistency...")
-			window.location.reload()
-			return
+			log.info("Stock policy changed, reloading page for consistency...");
+			window.location.reload();
+			return;
 		}
 
 		// Show success toast for other changes
-		let successMessage = __("Settings saved successfully")
+		let successMessage = __("Settings saved successfully");
 		if (warehouseChanged && taxInclusiveChanged) {
-			successMessage = __("Settings saved, warehouse updated, and tax mode changed. Cart will be recalculated.")
+			successMessage = __(
+				"Settings saved, warehouse updated, and tax mode changed. Cart will be recalculated."
+			);
 		} else if (warehouseChanged) {
-			successMessage = __("Settings saved and warehouse updated. Reloading stock...")
+			successMessage = __("Settings saved and warehouse updated. Reloading stock...");
 		} else if (taxInclusiveChanged) {
 			successMessage = settings.value.tax_inclusive
 				? __('Settings saved. Tax mode is now "inclusive". Cart will be recalculated.')
-				: __('Settings saved. Tax mode is now "exclusive". Cart will be recalculated.')
+				: __('Settings saved. Tax mode is now "exclusive". Cart will be recalculated.');
 		}
 
-		showSuccess(successMessage)
+		showSuccess(successMessage);
 	} catch (error) {
-		log.error("Error saving settings:", error)
-		showError(error.message || __("Failed to save settings"))
+		log.error("Error saving settings:", error);
+		showError(error.message || __("Failed to save settings"));
 	} finally {
-		saving.value = false
+		saving.value = false;
 	}
 }
 
@@ -890,10 +1467,10 @@ watch(
 	() => settings.value.silent_print,
 	async (enabled) => {
 		if (enabled) {
-			await handleQzConnect()
+			await handleQzConnect();
 		}
 	}
-)
+);
 
 // ============================================================================
 // STOCK SYNC FUNCTIONS
@@ -902,117 +1479,120 @@ watch(
 // Load stock sync settings from localStorage
 function loadStockSyncSettings() {
 	try {
-		const saved = localStorage.getItem('pos_stock_sync_settings')
+		const saved = localStorage.getItem("pos_stock_sync_settings");
 		if (saved) {
-			const parsed = JSON.parse(saved)
-			stockSyncEnabled.value = parsed.enabled ?? false
-			stockSyncIntervalSeconds.value = parsed.intervalSeconds ?? 60
+			const parsed = JSON.parse(saved);
+			stockSyncEnabled.value = parsed.enabled ?? false;
+			stockSyncIntervalSeconds.value = parsed.intervalSeconds ?? 60;
 		}
 	} catch (error) {
-		log.error('Failed to load stock sync settings:', error)
+		log.error("Failed to load stock sync settings:", error);
 	}
 }
 
 // Save stock sync settings to localStorage
 function saveStockSyncSettings() {
 	try {
-		localStorage.setItem('pos_stock_sync_settings', JSON.stringify({
-			enabled: stockSyncEnabled.value,
-			intervalSeconds: stockSyncIntervalSeconds.value
-		}))
+		localStorage.setItem(
+			"pos_stock_sync_settings",
+			JSON.stringify({
+				enabled: stockSyncEnabled.value,
+				intervalSeconds: stockSyncIntervalSeconds.value,
+			})
+		);
 	} catch (error) {
-		log.error('Failed to save stock sync settings:', error)
+		log.error("Failed to save stock sync settings:", error);
 	}
 }
 
 // Update stock sync status
 async function updateStockSyncStatus() {
 	try {
-		const status = await offlineWorker.getStockSyncStatus()
-		stockSyncStatus.value = status
+		const status = await offlineWorker.getStockSyncStatus();
+		stockSyncStatus.value = status;
 	} catch (error) {
-		log.error('Failed to get stock sync status:', error)
+		log.error("Failed to get stock sync status:", error);
 	}
 }
 
 // Apply stock sync configuration to worker
 async function applyStockSyncConfig() {
 	try {
-		const intervalMs = stockSyncIntervalSeconds.value * 1000
+		const intervalMs = stockSyncIntervalSeconds.value * 1000;
 
 		if (stockSyncEnabled.value) {
 			// Configure and start sync
 			await offlineWorker.configureStockSync({
-				intervalMs
-			})
-			await offlineWorker.startStockSync()
+				intervalMs,
+			});
+			await offlineWorker.startStockSync();
 		} else {
 			// Stop sync
-			await offlineWorker.stopStockSync()
+			await offlineWorker.stopStockSync();
 		}
 
 		// Update status
-		await updateStockSyncStatus()
+		await updateStockSyncStatus();
 
 		// Save to localStorage
-		saveStockSyncSettings()
+		saveStockSyncSettings();
 
 		// Emit sync configuration change event
 		emitStockSyncConfigured({
 			enabled: stockSyncEnabled.value,
-			intervalMs: intervalMs
-		})
+			intervalMs: intervalMs,
+		});
 	} catch (error) {
-		log.error('Failed to apply stock sync config:', error)
+		log.error("Failed to apply stock sync config:", error);
 	}
 }
 
 // Format sync time for display
 function formatSyncTime(timestamp) {
-	if (!timestamp) return __('Never')
+	if (!timestamp) return __("Never");
 
-	const now = Date.now()
-	const diff = now - timestamp
+	const now = Date.now();
+	const diff = now - timestamp;
 
 	if (diff < 60000) {
-		return __('{0}s ago', [Math.floor(diff / 1000)])
+		return __("{0}s ago", [Math.floor(diff / 1000)]);
 	} else if (diff < 3600000) {
-		return __('{0}m ago', [Math.floor(diff / 60000)])
+		return __("{0}m ago", [Math.floor(diff / 60000)]);
 	} else {
-		const date = new Date(timestamp)
-		return date.toLocaleTimeString()
+		const date = new Date(timestamp);
+		return date.toLocaleTimeString();
 	}
 }
 
 // Watch for changes and apply
 watch(stockSyncEnabled, () => {
-	applyStockSyncConfig()
-})
+	applyStockSyncConfig();
+});
 
 watch(stockSyncIntervalSeconds, () => {
 	if (stockSyncEnabled.value) {
-		applyStockSyncConfig()
+		applyStockSyncConfig();
 	}
-})
+});
 
 // Lifecycle hooks
 onMounted(async () => {
 	// Load settings
-	loadStockSyncSettings()
+	loadStockSyncSettings();
 
 	// Update status initially
-	await updateStockSyncStatus()
+	await updateStockSyncStatus();
 
 	// Poll status every 5 seconds
 	const statusInterval = setInterval(() => {
-		updateStockSyncStatus()
-	}, 5000)
+		updateStockSyncStatus();
+	}, 5000);
 
 	// Cleanup on unmount
 	onUnmounted(() => {
-		clearInterval(statusInterval)
-	})
-})
+		clearInterval(statusInterval);
+	});
+});
 </script>
 
 <style scoped>
diff --git a/POS/src/composables/usePermissions.js b/POS/src/composables/usePermissions.js
index 9e2efddd..a81401fb 100644
--- a/POS/src/composables/usePermissions.js
+++ b/POS/src/composables/usePermissions.js
@@ -1,5 +1,5 @@
-import { call } from "@/utils/apiWrapper"
-import { computed, ref } from "vue"
+import { call } from "@/utils/apiWrapper";
+import { computed, ref } from "vue";
 
 /**
  * Composable for checking user permissions
@@ -7,7 +7,7 @@ import { computed, ref } from "vue"
  */
 
 // Cache permissions to avoid repeated API calls
-const permissionCache = ref({})
+const permissionCache = ref({});
 
 export function usePermissions() {
 	/**
@@ -20,9 +20,9 @@ export function usePermissions() {
 	async function checkPermission(doctype, permType = "create", docname = null) {
 		try {
 			// Check cache first
-			const cacheKey = `${doctype}:${permType}`
+			const cacheKey = `${doctype}:${permType}`;
 			if (permissionCache.value[cacheKey] !== undefined) {
-				return permissionCache.value[cacheKey]
+				return permissionCache.value[cacheKey];
 			}
 
 			// Call backend to check permission
@@ -30,21 +30,18 @@ export function usePermissions() {
 				doctype: doctype,
 				docname: docname || "",
 				perm_type: permType,
-			})
+			});
 
 			// Extract has_permission from response object
-			const hasPermission = Boolean(result?.has_permission)
+			const hasPermission = Boolean(result?.has_permission);
 
 			// Cache the result
-			permissionCache.value[cacheKey] = hasPermission
-			return hasPermission
+			permissionCache.value[cacheKey] = hasPermission;
+			return hasPermission;
 		} catch (error) {
-			console.error(
-				`Error checking permission for ${doctype}:${permType}`,
-				error,
-			)
+			console.error(`Error checking permission for ${doctype}:${permType}`, error);
 			// Default to false on error (safer)
-			return false
+			return false;
 		}
 	}
 
@@ -54,16 +51,16 @@ export function usePermissions() {
 	 * @returns {Promise<Object>} - Object with results keyed by "doctype:permType"
 	 */
 	async function checkMultiplePermissions(checks) {
-		const results = {}
+		const results = {};
 
 		await Promise.all(
 			checks.map(async ({ doctype, permType = "create" }) => {
-				const key = `${doctype}:${permType}`
-				results[key] = await checkPermission(doctype, permType)
-			}),
-		)
+				const key = `${doctype}:${permType}`;
+				results[key] = await checkPermission(doctype, permType);
+			})
+		);
 
-		return results
+		return results;
 	}
 
 	/**
@@ -73,33 +70,33 @@ export function usePermissions() {
 	 * @returns {Object} - { hasPermission, loading, checkPermission }
 	 */
 	function usePermissionCheck(doctype, permType = "create") {
-		const hasPermission = ref(false)
-		const loading = ref(false)
+		const hasPermission = ref(false);
+		const loading = ref(false);
 
 		const check = async () => {
-			loading.value = true
+			loading.value = true;
 			try {
-				hasPermission.value = await checkPermission(doctype, permType)
+				hasPermission.value = await checkPermission(doctype, permType);
 			} finally {
-				loading.value = false
+				loading.value = false;
 			}
-		}
+		};
 
 		// Check immediately
-		check()
+		check();
 
 		return {
 			hasPermission: computed(() => hasPermission.value),
 			loading: computed(() => loading.value),
 			refresh: check,
-		}
+		};
 	}
 
 	/**
 	 * Clear permission cache (useful after role changes)
 	 */
 	function clearCache() {
-		permissionCache.value = {}
+		permissionCache.value = {};
 	}
 
 	/**
@@ -116,9 +113,9 @@ export function usePermissions() {
 			{ doctype: "POS Coupon", permType: "write" },
 			{ doctype: "Sales Invoice", permType: "create" },
 			{ doctype: "Sales Invoice", permType: "submit" },
-		]
+		];
 
-		await checkMultiplePermissions(commonChecks)
+		await checkMultiplePermissions(commonChecks);
 	}
 
 	return {
@@ -127,43 +124,34 @@ export function usePermissions() {
 		usePermissionCheck,
 		clearCache,
 		preloadCommonPermissions,
-	}
+	};
 }
 
 /**
  * Permission helper for common POS operations
  */
 export function usePOSPermissions() {
-	const { checkPermission, preloadCommonPermissions } = usePermissions()
+	const { checkPermission, preloadCommonPermissions } = usePermissions();
 
 	// Customer permissions
-	const canCreateCustomer = async () =>
-		await checkPermission("Customer", "create")
-	const canEditCustomer = async () => await checkPermission("Customer", "write")
+	const canCreateCustomer = async () => await checkPermission("Customer", "create");
+	const canEditCustomer = async () => await checkPermission("Customer", "write");
 
 	// Promotion permissions
-	const canCreatePromotion = async () =>
-		await checkPermission("Promotional Scheme", "create")
-	const canEditPromotion = async () =>
-		await checkPermission("Promotional Scheme", "write")
-	const canDeletePromotion = async () =>
-		await checkPermission("Promotional Scheme", "delete")
+	const canCreatePromotion = async () => await checkPermission("Promotional Scheme", "create");
+	const canEditPromotion = async () => await checkPermission("Promotional Scheme", "write");
+	const canDeletePromotion = async () => await checkPermission("Promotional Scheme", "delete");
 
 	// Coupon permissions
-	const canCreateCoupon = async () =>
-		await checkPermission("POS Coupon", "create")
-	const canApplyCoupon = async () =>
-		await checkPermission("POS Coupon", "write")
+	const canCreateCoupon = async () => await checkPermission("POS Coupon", "create");
+	const canApplyCoupon = async () => await checkPermission("POS Coupon", "write");
 
 	// Invoice permissions
-	const canCreateInvoice = async () =>
-		await checkPermission("Sales Invoice", "create")
-	const canSubmitInvoice = async () =>
-		await checkPermission("Sales Invoice", "submit")
+	const canCreateInvoice = async () => await checkPermission("Sales Invoice", "create");
+	const canSubmitInvoice = async () => await checkPermission("Sales Invoice", "submit");
 
 	// Settings permissions
-	const canEditSettings = async () =>
-		await checkPermission("POS Settings", "write")
+	const canEditSettings = async () => await checkPermission("POS Next Settings", "write");
 
 	return {
 		canCreateCustomer,
@@ -177,5 +165,5 @@ export function usePOSPermissions() {
 		canSubmitInvoice,
 		canEditSettings,
 		preloadCommonPermissions,
-	}
+	};
 }
diff --git a/POS/src/stores/posSettings.js b/POS/src/stores/posSettings.js
index 9278faf4..cdbf455a 100644
--- a/POS/src/stores/posSettings.js
+++ b/POS/src/stores/posSettings.js
@@ -1,7 +1,7 @@
-import { createResource } from "frappe-ui"
-import { defineStore } from "pinia"
-import { computed, ref } from "vue"
-import { useBootstrapStore } from "./bootstrap"
+import { createResource } from "frappe-ui";
+import { defineStore } from "pinia";
+import { computed, ref } from "vue";
+import { useBootstrapStore } from "./bootstrap";
 
 export const usePOSSettingsStore = defineStore("posSettings", () => {
 	// State
@@ -68,214 +68,152 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 		// Security
 		enable_session_lock: 0,
 		session_lock_timeout: 5,
-	})
+	});
 
-	const isLoading = ref(false)
-	const isLoaded = ref(false)
+	const isLoading = ref(false);
+	const isLoaded = ref(false);
 
 	// Computed - Wallet & Loyalty Settings
-	const enableLoyaltyProgram = computed(() =>
-		Boolean(settings.value.enable_loyalty_program),
-	)
-	const defaultLoyaltyProgram = computed(() =>
-		settings.value.default_loyalty_program || "",
-	)
-	const walletAccount = computed(() =>
-		settings.value.wallet_account || "",
-	)
-	const autoCreateWallet = computed(() =>
-		Boolean(settings.value.auto_create_wallet),
-	)
-	const loyaltyToWallet = computed(() =>
-		Boolean(settings.value.loyalty_to_wallet),
-	)
+	const enableLoyaltyProgram = computed(() => Boolean(settings.value.enable_loyalty_program));
+	const defaultLoyaltyProgram = computed(() => settings.value.default_loyalty_program || "");
+	const walletAccount = computed(() => settings.value.wallet_account || "");
+	const autoCreateWallet = computed(() => Boolean(settings.value.auto_create_wallet));
+	const loyaltyToWallet = computed(() => Boolean(settings.value.loyalty_to_wallet));
 
 	// Computed - General Settings
-	const isEnabled = computed(() => Boolean(settings.value.enabled))
+	const isEnabled = computed(() => Boolean(settings.value.enabled));
 	const maxDiscountAllowed = computed(
-		() => Number.parseFloat(settings.value.max_discount_allowed) || 0,
-	)
-	const usePercentageDiscount = computed(() =>
-		Boolean(settings.value.use_percentage_discount),
-	)
+		() => Number.parseFloat(settings.value.max_discount_allowed) || 0
+	);
+	const usePercentageDiscount = computed(() => Boolean(settings.value.use_percentage_discount));
 	const allowAdditionalDiscount = computed(() =>
-		Boolean(settings.value.allow_user_to_edit_additional_discount),
-	)
+		Boolean(settings.value.allow_user_to_edit_additional_discount)
+	);
 	const allowItemDiscount = computed(() =>
-		Boolean(settings.value.allow_user_to_edit_item_discount),
-	)
-	const allowUserToEditRate = computed(() =>
-		Boolean(settings.value.allow_user_to_edit_rate),
-	)
-	const disableRoundedTotal = computed(() =>
-		Boolean(settings.value.disable_rounded_total),
-	)
-	const allowCreditSale = computed(() =>
-		Boolean(settings.value.allow_credit_sale),
-	)
+		Boolean(settings.value.allow_user_to_edit_item_discount)
+	);
+	const allowUserToEditRate = computed(() => Boolean(settings.value.allow_user_to_edit_rate));
+	const disableRoundedTotal = computed(() => Boolean(settings.value.disable_rounded_total));
+	const allowCreditSale = computed(() => Boolean(settings.value.allow_credit_sale));
 	const allowCustomerCreditPayment = computed(() =>
-		Boolean(settings.value.allow_customer_credit_payment),
-	)
-	const allowReturn = computed(() => Boolean(settings.value.allow_return))
-	const allowWriteOffChange = computed(() =>
-		Boolean(settings.value.allow_write_off_change),
-	)
-	const allowPartialPayment = computed(() =>
-		Boolean(settings.value.allow_partial_payment),
-	)
-	const useExactAmount = computed(() =>
-		Boolean(settings.value.use_exact_amount),
-	)
+		Boolean(settings.value.allow_customer_credit_payment)
+	);
+	const allowReturn = computed(() => Boolean(settings.value.allow_return));
+	const allowWriteOffChange = computed(() => Boolean(settings.value.allow_write_off_change));
+	const allowPartialPayment = computed(() => Boolean(settings.value.allow_partial_payment));
+	const useExactAmount = computed(() => Boolean(settings.value.use_exact_amount));
 
 	// Computed - Display Settings
-	const defaultCardView = computed(() =>
-		Boolean(settings.value.default_card_view),
-	)
-	const displayItemCode = computed(() =>
-		Boolean(settings.value.display_item_code),
-	)
-	const showCustomerBalance = computed(() =>
-		Boolean(settings.value.show_customer_balance),
-	)
-	const hideExpectedAmount = computed(() =>
-		Boolean(settings.value.hide_expected_amount),
-	)
+	const defaultCardView = computed(() => Boolean(settings.value.default_card_view));
+	const displayItemCode = computed(() => Boolean(settings.value.display_item_code));
+	const showCustomerBalance = computed(() => Boolean(settings.value.show_customer_balance));
+	const hideExpectedAmount = computed(() => Boolean(settings.value.hide_expected_amount));
 	const displayDiscountPercentage = computed(() =>
-		Boolean(settings.value.display_discount_percentage),
-	)
-	const displayDiscountAmount = computed(() =>
-		Boolean(settings.value.display_discount_amount),
-	)
-	const showVariantsAsItems = computed(() =>
-		Boolean(settings.value.show_variants_as_items),
-	)
+		Boolean(settings.value.display_discount_percentage)
+	);
+	const displayDiscountAmount = computed(() => Boolean(settings.value.display_discount_amount));
+	const showVariantsAsItems = computed(() => Boolean(settings.value.show_variants_as_items));
 
 	// Computed - Operations
-	const allowSalesOrder = computed(() =>
-		Boolean(settings.value.allow_sales_order),
-	)
-	const allowSelectSalesOrder = computed(() =>
-		Boolean(settings.value.allow_select_sales_order),
-	)
-	const createOnlySalesOrder = computed(() =>
-		Boolean(settings.value.create_only_sales_order),
-	)
+	const allowSalesOrder = computed(() => Boolean(settings.value.allow_sales_order));
+	const allowSelectSalesOrder = computed(() => Boolean(settings.value.allow_select_sales_order));
+	const createOnlySalesOrder = computed(() => Boolean(settings.value.create_only_sales_order));
 	const allowReturnWithoutInvoice = computed(() =>
-		Boolean(settings.value.allow_return_without_invoice),
-	)
-	const allowFreeBatchReturn = computed(() =>
-		Boolean(settings.value.allow_free_batch_return),
-	)
+		Boolean(settings.value.allow_return_without_invoice)
+	);
+	const allowFreeBatchReturn = computed(() => Boolean(settings.value.allow_free_batch_return));
 	const allowPrintDraftInvoices = computed(() =>
-		Boolean(settings.value.allow_print_draft_invoices),
-	)
+		Boolean(settings.value.allow_print_draft_invoices)
+	);
 
 	// Computed - Pricing & Display
 	const decimalPrecision = computed(
-		() => Number.parseInt(settings.value.decimal_precision) || 2,
-	)
+		() => Number.parseInt(settings.value.decimal_precision) || 2
+	);
 
 	// Computed - Customer Settings
 	const allowCustomerPurchaseOrder = computed(() =>
-		Boolean(settings.value.allow_customer_purchase_order),
-	)
+		Boolean(settings.value.allow_customer_purchase_order)
+	);
 	const allowDuplicateCustomerNames = computed(() =>
-		Boolean(settings.value.allow_duplicate_customer_names),
-	)
-	const fetchCoupon = computed(() => Boolean(settings.value.fetch_coupon))
+		Boolean(settings.value.allow_duplicate_customer_names)
+	);
+	const fetchCoupon = computed(() => Boolean(settings.value.fetch_coupon));
 
 	// Computed - Printing
-	const allowPrintLastInvoice = computed(() =>
-		Boolean(settings.value.allow_print_last_invoice),
-	)
-	const silentPrint = computed(() => Boolean(settings.value.silent_print))
+	const allowPrintLastInvoice = computed(() => Boolean(settings.value.allow_print_last_invoice));
+	const silentPrint = computed(() => Boolean(settings.value.silent_print));
 
 	// Computed - Delivery
-	const useDeliveryCharges = computed(() =>
-		Boolean(settings.value.use_delivery_charges),
-	)
+	const useDeliveryCharges = computed(() => Boolean(settings.value.use_delivery_charges));
 	const autoSetDeliveryCharges = computed(() =>
-		Boolean(settings.value.auto_set_delivery_charges),
-	)
+		Boolean(settings.value.auto_set_delivery_charges)
+	);
 
 	// Computed - Advanced Settings
-	const useLimitSearch = computed(() =>
-		Boolean(settings.value.use_limit_search),
-	)
-	const searchLimit = computed(
-		() => Number.parseInt(settings.value.search_limit) || 1000,
-	)
+	const useLimitSearch = computed(() => Boolean(settings.value.use_limit_search));
+	const searchLimit = computed(() => Number.parseInt(settings.value.search_limit) || 1000);
 	const allowSubmissionsInBackgroundJob = computed(() =>
-		Boolean(settings.value.allow_submissions_in_background_job),
-	)
+		Boolean(settings.value.allow_submissions_in_background_job)
+	);
 	const allowDeleteOfflineInvoice = computed(() =>
-		Boolean(settings.value.allow_delete_offline_invoice),
-	)
+		Boolean(settings.value.allow_delete_offline_invoice)
+	);
 	const allowChangePostingDate = computed(() =>
-		Boolean(settings.value.allow_change_posting_date),
-	)
+		Boolean(settings.value.allow_change_posting_date)
+	);
 
 	// Computed - Miscellaneous
-	const inputQty = computed(() => Boolean(settings.value.input_qty))
-	const allowNegativeStock = computed(() =>
-		Boolean(settings.value.allow_negative_stock),
-	)
+	const inputQty = computed(() => Boolean(settings.value.input_qty));
+	const allowNegativeStock = computed(() => Boolean(settings.value.allow_negative_stock));
 
 	// Computed - Sales Persons
-	const enableSalesPersons = computed(() =>
-		settings.value.enable_sales_persons !== "Disabled"
-	)
-	const salesPersonsMode = computed(() =>
-		settings.value.enable_sales_persons || "Disabled"
-	)
-	const isSingleSalesPerson = computed(() =>
-		settings.value.enable_sales_persons === "Single"
-	)
-	const isMultipleSalesPersons = computed(() =>
-		settings.value.enable_sales_persons === "Multiple"
-	)
+	const enableSalesPersons = computed(() => settings.value.enable_sales_persons !== "Disabled");
+	const salesPersonsMode = computed(() => settings.value.enable_sales_persons || "Disabled");
+	const isSingleSalesPerson = computed(() => settings.value.enable_sales_persons === "Single");
+	const isMultipleSalesPersons = computed(
+		() => settings.value.enable_sales_persons === "Multiple"
+	);
 
 	// Computed - Security
-	const enableSessionLock = computed(() =>
-		Boolean(settings.value.enable_session_lock),
-	)
+	const enableSessionLock = computed(() => Boolean(settings.value.enable_session_lock));
 	const sessionLockTimeout = computed(
-		() => Number.parseInt(settings.value.session_lock_timeout) || 5,
-	)
+		() => Number.parseInt(settings.value.session_lock_timeout) || 5
+	);
 
 	// Resource
 	const settingsResource = createResource({
-		url: "pos_next.pos_next.doctype.pos_settings.pos_settings.get_pos_settings",
+		url: "pos_next.pos_next.doctype.pos_next_settings.pos_next_settings.get_pos_settings",
 		onSuccess(data) {
 			if (data) {
-				Object.assign(settings.value, data)
-				isLoaded.value = true
+				Object.assign(settings.value, data);
+				isLoaded.value = true;
 			}
-			isLoading.value = false
+			isLoading.value = false;
 		},
 		onError(error) {
-			isLoading.value = false
+			isLoading.value = false;
 		},
-	})
+	});
 
 	// Actions
 	async function loadSettings(posProfile) {
 		if (!posProfile) {
-			return false
+			return false;
 		}
 
-		isLoading.value = true
-		settings.value.pos_profile = posProfile
+		isLoading.value = true;
+		settings.value.pos_profile = posProfile;
 
 		// OPTIMIZATION: Check if bootstrap has preloaded the settings
 		try {
-			const bootstrapStore = useBootstrapStore()
-			const preloadedSettings = bootstrapStore.getPreloadedPOSSettings()
+			const bootstrapStore = useBootstrapStore();
+			const preloadedSettings = bootstrapStore.getPreloadedPOSSettings();
 			if (preloadedSettings && Object.keys(preloadedSettings).length > 0) {
-				Object.assign(settings.value, preloadedSettings)
-				isLoaded.value = true
-				isLoading.value = false
-				return true
+				Object.assign(settings.value, preloadedSettings);
+				isLoaded.value = true;
+				isLoading.value = false;
+				return true;
 			}
 		} catch {
 			// Bootstrap store may not be available, fall through to API call
@@ -283,10 +221,10 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 
 		// Fallback to API call
 		try {
-			await settingsResource.submit({ pos_profile: posProfile })
-			return true
+			await settingsResource.submit({ pos_profile: posProfile });
+			return true;
 		} catch {
-			return false
+			return false;
 		}
 	}
 
@@ -345,8 +283,8 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 			// Security
 			enable_session_lock: 0,
 			session_lock_timeout: 5,
-		}
-		isLoaded.value = false
+		};
+		isLoaded.value = false;
 	}
 
 	/**
@@ -356,10 +294,10 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 	 */
 	function validateDiscount(discountPercentage) {
 		if (!isEnabled.value || maxDiscountAllowed.value === 0) {
-			return true // No restriction if settings disabled or max = 0
+			return true; // No restriction if settings disabled or max = 0
 		}
 
-		return discountPercentage <= maxDiscountAllowed.value
+		return discountPercentage <= maxDiscountAllowed.value;
 	}
 
 	/**
@@ -367,7 +305,7 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 	 * @returns {boolean} - True if negative stock is allowed
 	 */
 	function isNegativeStockAllowed() {
-		return isEnabled.value && Boolean(settings.value.allow_negative_stock)
+		return isEnabled.value && Boolean(settings.value.allow_negative_stock);
 	}
 
 	/**
@@ -375,7 +313,7 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 	 * @returns {boolean} - True if stock validation should prevent negative stock
 	 */
 	function shouldEnforceStockValidation() {
-		return isEnabled.value && !Boolean(settings.value.allow_negative_stock)
+		return isEnabled.value && !Boolean(settings.value.allow_negative_stock);
 	}
 
 	/**
@@ -385,17 +323,17 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 	 */
 	async function reloadSettings() {
 		if (!settings.value.pos_profile) {
-			return false
+			return false;
 		}
 
-		isLoading.value = true
+		isLoading.value = true;
 
 		try {
 			// Use submit with pos_profile to ensure proper reload
-			await settingsResource.submit({ pos_profile: settings.value.pos_profile })
-			return true
+			await settingsResource.submit({ pos_profile: settings.value.pos_profile });
+			return true;
 		} catch {
-			return false
+			return false;
 		}
 	}
 
@@ -488,5 +426,5 @@ export const usePOSSettingsStore = defineStore("posSettings", () => {
 		validateDiscount,
 		isNegativeStockAllowed,
 		shouldEnforceStockValidation,
-	}
-})
+	};
+});
diff --git a/pos_next/api/bootstrap.py b/pos_next/api/bootstrap.py
index c66df930..a76b853b 100644
--- a/pos_next/api/bootstrap.py
+++ b/pos_next/api/bootstrap.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2024, POS Next and contributors
 # For license information, please see license.txt
 
@@ -30,7 +29,7 @@
 from frappe.query_builder import DocType
 from frappe.query_builder.functions import Coalesce
 
-from pos_next.api.constants import POS_SETTINGS_FIELDS, DEFAULT_POS_SETTINGS
+from pos_next.api.constants import DEFAULT_POS_SETTINGS, POS_SETTINGS_FIELDS
 
 
 @frappe.whitelist()
@@ -113,6 +112,7 @@ def get_initial_data():
 # Private Helper Functions
 # =============================================================================
 
+
 def _get_user_language():
 	"""
 	Get user's language preference from User doctype.
@@ -143,7 +143,7 @@ def _get_precision_settings():
 		"System Settings",
 		"System Settings",
 		["currency_precision", "float_precision", "rounding_method", "number_format"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	return {
@@ -207,17 +207,20 @@ def _get_pos_settings(pos_profile_doc):
 		dict: POS Settings with derived values
 	"""
 	try:
-		settings = frappe.db.get_value(
-			"POS Settings",
-			{"pos_profile": pos_profile_doc.name, "enabled": 1},
-			POS_SETTINGS_FIELDS,
-			as_dict=True
-		) or DEFAULT_POS_SETTINGS.copy()
+		settings = (
+			frappe.db.get_value(
+				"POS Next Settings",
+				{"pos_profile": pos_profile_doc.name, "enabled": 1},
+				POS_SETTINGS_FIELDS,
+				as_dict=True,
+			)
+			or DEFAULT_POS_SETTINGS.copy()
+		)
 
 		# Derive from POS Profile (single source of truth)
-		settings["allow_write_off_change"] = 1 if (
-			pos_profile_doc.write_off_account and (pos_profile_doc.write_off_limit or 0) > 0
-		) else 0
+		settings["allow_write_off_change"] = (
+			1 if (pos_profile_doc.write_off_account and (pos_profile_doc.write_off_limit or 0) > 0) else 0
+		)
 		settings["disable_rounded_total"] = pos_profile_doc.disable_rounded_total or 0
 
 		return settings
@@ -255,7 +258,7 @@ def _get_payment_methods(pos_profile_name):
 				POSPaymentMethod.mode_of_payment,
 				POSPaymentMethod.default,
 				POSPaymentMethod.allow_in_returns,
-				Coalesce(ModeOfPayment.type, "Cash").as_("type")
+				Coalesce(ModeOfPayment.type, "Cash").as_("type"),
 			)
 			.where(POSPaymentMethod.parent == pos_profile_name)
 			.orderby(POSPaymentMethod.idx)
diff --git a/pos_next/api/credit_sales.py b/pos_next/api/credit_sales.py
index 5644c750..9688f16b 100644
--- a/pos_next/api/credit_sales.py
+++ b/pos_next/api/credit_sales.py
@@ -11,7 +11,7 @@
 
 import frappe
 from frappe import _
-from frappe.utils import flt, nowdate, today, cint, get_datetime
+from frappe.utils import cint, flt, get_datetime, nowdate, today
 
 
 @frappe.whitelist()
@@ -46,16 +46,13 @@ def get_customer_balance(customer, company=None):
 
 	try:
 		from frappe.query_builder import DocType
-		from frappe.query_builder.functions import Sum, Abs, Coalesce
+		from frappe.query_builder.functions import Abs, Coalesce, Sum
 		from pypika import Case
 
 		SalesInvoice = DocType("Sales Invoice")
 
 		# Build base filters
-		base_filters = (
-			(SalesInvoice.customer == customer) &
-			(SalesInvoice.docstatus == 1)
-		)
+		base_filters = (SalesInvoice.customer == customer) & (SalesInvoice.docstatus == 1)
 		if company:
 			base_filters = base_filters & (SalesInvoice.company == company)
 
@@ -72,7 +69,7 @@ def get_customer_balance(customer, company=None):
 						.when(SalesInvoice.outstanding_amount > 0, SalesInvoice.outstanding_amount)
 						.else_(0)
 					),
-					0
+					0,
 				).as_("total_outstanding")
 			)
 			.where(base_filters & (SalesInvoice.is_return == 0))
@@ -84,14 +81,8 @@ def get_customer_balance(customer, company=None):
 		# If no cash refund (added to customer credit), outstanding_amount < 0
 		return_query = (
 			frappe.qb.from_(SalesInvoice)
-			.select(
-				Coalesce(Sum(Abs(SalesInvoice.outstanding_amount)), 0).as_("return_credit")
-			)
-			.where(
-				base_filters &
-				(SalesInvoice.is_return == 1) &
-				(SalesInvoice.outstanding_amount < 0)
-			)
+			.select(Coalesce(Sum(Abs(SalesInvoice.outstanding_amount)), 0).as_("return_credit"))
+			.where(base_filters & (SalesInvoice.is_return == 1) & (SalesInvoice.outstanding_amount < 0))
 		)
 
 		# Execute queries
@@ -109,19 +100,15 @@ def get_customer_balance(customer, company=None):
 		return {
 			"total_outstanding": total_outstanding,
 			"total_credit": total_credit,
-			"net_balance": net_balance
+			"net_balance": net_balance,
 		}
 
 	except Exception as e:
 		frappe.log_error(
 			title="Customer Balance Error",
-			message=f"Customer: {customer}, Company: {company}, Error: {str(e)}\n{frappe.get_traceback()}"
+			message=f"Customer: {customer}, Company: {company}, Error: {e!s}\n{frappe.get_traceback()}",
 		)
-		return {
-			"total_outstanding": 0.0,
-			"total_credit": 0.0,
-			"net_balance": 0.0
-		}
+		return {"total_outstanding": 0.0, "total_credit": 0.0, "net_balance": 0.0}
 
 
 def check_credit_sale_enabled(pos_profile):
@@ -139,10 +126,7 @@ def check_credit_sale_enabled(pos_profile):
 
 	# Get POS Settings for the profile
 	pos_settings = frappe.db.get_value(
-		"POS Settings",
-		{"pos_profile": pos_profile},
-		"allow_credit_sale",
-		as_dict=False
+		"POS Next Settings", {"pos_profile": pos_profile}, "allow_credit_sale", as_dict=False
 	)
 
 	return bool(pos_settings)
@@ -186,7 +170,7 @@ def get_available_credit(customer, company, pos_profile=None):
 			"company": company,
 		},
 		fields=["name", "outstanding_amount", "is_return", "posting_date", "grand_total", "modified"],
-		order_by="posting_date desc"
+		order_by="posting_date desc",
 	)
 
 	for row in outstanding_invoices:
@@ -194,17 +178,19 @@ def get_available_credit(customer, company, pos_profile=None):
 		available_credit = -flt(row.outstanding_amount)
 
 		if available_credit > 0:
-			total_credit.append({
-				"type": "Invoice",
-				"credit_origin": row.name,
-				"total_credit": available_credit,
-				"available_credit": available_credit,
-				"source_type": "Sales Return" if row.is_return else "Sales Invoice",
-				"posting_date": row.posting_date,
-				"reference_amount": row.grand_total,
-				"credit_to_redeem": 0,  # User will set this
-				"modified": row.modified,  # For optimistic locking
-			})
+			total_credit.append(
+				{
+					"type": "Invoice",
+					"credit_origin": row.name,
+					"total_credit": available_credit,
+					"available_credit": available_credit,
+					"source_type": "Sales Return" if row.is_return else "Sales Invoice",
+					"posting_date": row.posting_date,
+					"reference_amount": row.grand_total,
+					"credit_to_redeem": 0,  # User will set this
+					"modified": row.modified,  # For optimistic locking
+				}
+			)
 
 	# Get unallocated advance payments
 	advances = frappe.get_all(
@@ -217,22 +203,24 @@ def get_available_credit(customer, company, pos_profile=None):
 			"payment_type": "Receive",
 		},
 		fields=["name", "unallocated_amount", "posting_date", "paid_amount", "mode_of_payment", "modified"],
-		order_by="posting_date desc"
+		order_by="posting_date desc",
 	)
 
 	for row in advances:
-		total_credit.append({
-			"type": "Advance",
-			"credit_origin": row.name,
-			"total_credit": flt(row.unallocated_amount),
-			"available_credit": flt(row.unallocated_amount),
-			"source_type": "Payment Entry",
-			"posting_date": row.posting_date,
-			"reference_amount": row.paid_amount,
-			"mode_of_payment": row.mode_of_payment,
-			"credit_to_redeem": 0,  # User will set this
-			"modified": row.modified,  # For optimistic locking
-		})
+		total_credit.append(
+			{
+				"type": "Advance",
+				"credit_origin": row.name,
+				"total_credit": flt(row.unallocated_amount),
+				"available_credit": flt(row.unallocated_amount),
+				"source_type": "Payment Entry",
+				"posting_date": row.posting_date,
+				"reference_amount": row.paid_amount,
+				"mode_of_payment": row.mode_of_payment,
+				"credit_to_redeem": 0,  # User will set this
+				"modified": row.modified,  # For optimistic locking
+			}
+		)
 
 	return total_credit
 
@@ -292,11 +280,7 @@ def redeem_customer_credit(invoice_name, customer_credit_dict):
 			)
 
 			# Create JE to allocate credit from original invoice to new invoice
-			je_name = _create_credit_allocation_journal_entry(
-				invoice_doc,
-				credit_origin,
-				credit_to_redeem
-			)
+			je_name = _create_credit_allocation_journal_entry(invoice_doc, credit_origin, credit_to_redeem)
 			created_journal_entries.append(je_name)
 
 		elif credit_type == "Advance":
@@ -309,11 +293,7 @@ def redeem_customer_credit(invoice_name, customer_credit_dict):
 			)
 
 			# Create Payment Entry to allocate advance payment
-			pe_name = _create_payment_entry_from_advance(
-				invoice_doc,
-				credit_origin,
-				credit_to_redeem
-			)
+			pe_name = _create_payment_entry_from_advance(invoice_doc, credit_origin, credit_to_redeem)
 			created_journal_entries.append(pe_name)
 
 	return created_journal_entries
@@ -322,14 +302,10 @@ def redeem_customer_credit(invoice_name, customer_credit_dict):
 def _validate_credit_source_ownership(source_name, source_customer, source_company, customer, company):
 	"""Ensure a credit source belongs to the same customer and company as the target invoice."""
 	if source_customer != customer:
-		frappe.throw(
-			_("Credit source {0} does not belong to customer {1}").format(source_name, customer)
-		)
+		frappe.throw(_("Credit source {0} does not belong to customer {1}").format(source_name, customer))
 
 	if source_company != company:
-		frappe.throw(
-			_("Credit source {0} does not belong to company {1}").format(source_name, company)
-		)
+		frappe.throw(_("Credit source {0} does not belong to company {1}").format(source_name, company))
 
 
 def _validate_and_lock_invoice_credit(invoice_name, amount_to_redeem, customer, company):
@@ -360,10 +336,7 @@ def _validate_and_lock_invoice_credit(invoice_name, amount_to_redeem, customer,
 			SalesInvoice.customer,
 			SalesInvoice.company,
 		)
-		.where(
-			(SalesInvoice.name == invoice_name) &
-			(SalesInvoice.docstatus == 1)
-		)
+		.where((SalesInvoice.name == invoice_name) & (SalesInvoice.docstatus == 1))
 		.for_update()
 	)
 
@@ -388,7 +361,7 @@ def _validate_and_lock_invoice_credit(invoice_name, amount_to_redeem, customer,
 			_("Insufficient credit available from {0}. Available: {1}, Requested: {2}").format(
 				invoice_name,
 				frappe.format_value(available_credit, {"fieldtype": "Currency"}),
-				frappe.format_value(amount_to_redeem, {"fieldtype": "Currency"})
+				frappe.format_value(amount_to_redeem, {"fieldtype": "Currency"}),
 			)
 		)
 
@@ -422,10 +395,7 @@ def _validate_and_lock_advance_credit(payment_entry_name, amount_to_redeem, cust
 			PaymentEntry.party_type,
 			PaymentEntry.payment_type,
 		)
-		.where(
-			(PaymentEntry.name == payment_entry_name) &
-			(PaymentEntry.docstatus == 1)
-		)
+		.where((PaymentEntry.name == payment_entry_name) & (PaymentEntry.docstatus == 1))
 		.for_update()
 	)
 
@@ -435,9 +405,7 @@ def _validate_and_lock_advance_credit(payment_entry_name, amount_to_redeem, cust
 		frappe.throw(_("Payment Entry {0} not found or not submitted").format(payment_entry_name))
 
 	if result[0].party_type != "Customer" or result[0].payment_type != "Receive":
-		frappe.throw(
-			_("Payment Entry {0} is not a valid customer advance").format(payment_entry_name)
-		)
+		frappe.throw(_("Payment Entry {0} is not a valid customer advance").format(payment_entry_name))
 
 	_validate_credit_source_ownership(
 		payment_entry_name,
@@ -454,7 +422,7 @@ def _validate_and_lock_advance_credit(payment_entry_name, amount_to_redeem, cust
 			_("Insufficient unallocated amount in {0}. Available: {1}, Requested: {2}").format(
 				payment_entry_name,
 				frappe.format_value(available_amount, {"fieldtype": "Currency"}),
-				frappe.format_value(amount_to_redeem, {"fieldtype": "Currency"})
+				frappe.format_value(amount_to_redeem, {"fieldtype": "Currency"}),
 			)
 		)
 
@@ -492,48 +460,51 @@ def _create_credit_allocation_journal_entry(invoice_doc, original_invoice_name,
 	)
 
 	# Create Journal Entry
-	jv_doc = frappe.get_doc({
-		"doctype": "Journal Entry",
-		"voucher_type": "Journal Entry",
-		"posting_date": today(),
-		"company": invoice_doc.company,
-		"user_remark": get_credit_redeem_remark(invoice_doc.name),
-	})
+	jv_doc = frappe.get_doc(
+		{
+			"doctype": "Journal Entry",
+			"voucher_type": "Journal Entry",
+			"posting_date": today(),
+			"company": invoice_doc.company,
+			"user_remark": get_credit_redeem_remark(invoice_doc.name),
+		}
+	)
 
 	# Debit Entry - Original Invoice (reduces outstanding)
 	debit_row = jv_doc.append("accounts", {})
-	debit_row.update({
-		"account": original_invoice.debit_to,
-		"party_type": "Customer",
-		"party": invoice_doc.customer,
-		"reference_type": "Sales Invoice",
-		"reference_name": original_invoice.name,
-		"debit_in_account_currency": amount,
-		"credit_in_account_currency": 0,
-		"cost_center": cost_center,
-	})
+	debit_row.update(
+		{
+			"account": original_invoice.debit_to,
+			"party_type": "Customer",
+			"party": invoice_doc.customer,
+			"reference_type": "Sales Invoice",
+			"reference_name": original_invoice.name,
+			"debit_in_account_currency": amount,
+			"credit_in_account_currency": 0,
+			"cost_center": cost_center,
+		}
+	)
 
 	# Credit Entry - New Invoice (reduces outstanding)
 	credit_row = jv_doc.append("accounts", {})
-	credit_row.update({
-		"account": invoice_doc.debit_to,
-		"party_type": "Customer",
-		"party": invoice_doc.customer,
-		"reference_type": "Sales Invoice",
-		"reference_name": invoice_doc.name,
-		"debit_in_account_currency": 0,
-		"credit_in_account_currency": amount,
-		"cost_center": cost_center,
-	})
+	credit_row.update(
+		{
+			"account": invoice_doc.debit_to,
+			"party_type": "Customer",
+			"party": invoice_doc.customer,
+			"reference_type": "Sales Invoice",
+			"reference_name": invoice_doc.name,
+			"debit_in_account_currency": 0,
+			"credit_in_account_currency": amount,
+			"cost_center": cost_center,
+		}
+	)
 
 	jv_doc.flags.ignore_permissions = True
 	jv_doc.save()
 	jv_doc.submit()
 
-	frappe.msgprint(
-		_("Journal Entry {0} created for credit redemption").format(jv_doc.name),
-		alert=True
-	)
+	frappe.msgprint(_("Journal Entry {0} created for credit redemption").format(jv_doc.name), alert=True)
 
 	return jv_doc.name
 
@@ -555,9 +526,7 @@ def _create_payment_entry_from_advance(invoice_doc, payment_entry_name, amount):
 	payment_entry = frappe.get_doc("Payment Entry", payment_entry_name)
 
 	if payment_entry.party_type != "Customer" or payment_entry.payment_type != "Receive":
-		frappe.throw(
-			_("Payment Entry {0} is not a valid customer advance").format(payment_entry_name)
-		)
+		frappe.throw(_("Payment Entry {0} is not a valid customer advance").format(payment_entry_name))
 
 	_validate_credit_source_ownership(
 		payment_entry.name,
@@ -569,20 +538,19 @@ def _create_payment_entry_from_advance(invoice_doc, payment_entry_name, amount):
 
 	# Check if already allocated
 	if payment_entry.unallocated_amount < amount:
-		frappe.throw(
-			_("Payment Entry {0} has insufficient unallocated amount").format(
-				payment_entry_name
-			)
-		)
+		frappe.throw(_("Payment Entry {0} has insufficient unallocated amount").format(payment_entry_name))
 
 	# Add reference to invoice
-	payment_entry.append("references", {
-		"reference_doctype": "Sales Invoice",
-		"reference_name": invoice_doc.name,
-		"total_amount": invoice_doc.grand_total,
-		"outstanding_amount": invoice_doc.outstanding_amount,
-		"allocated_amount": amount,
-	})
+	payment_entry.append(
+		"references",
+		{
+			"reference_doctype": "Sales Invoice",
+			"reference_name": invoice_doc.name,
+			"total_amount": invoice_doc.grand_total,
+			"outstanding_amount": invoice_doc.outstanding_amount,
+			"allocated_amount": amount,
+		},
+	)
 
 	# Recalculate unallocated amount
 	payment_entry.set_amounts()
@@ -591,10 +559,7 @@ def _create_payment_entry_from_advance(invoice_doc, payment_entry_name, amount):
 	payment_entry.flags.ignore_validate_update_after_submit = True
 	payment_entry.save()
 
-	frappe.msgprint(
-		_("Payment Entry {0} allocated to invoice").format(payment_entry.name),
-		alert=True
-	)
+	frappe.msgprint(_("Payment Entry {0} allocated to invoice").format(payment_entry.name), alert=True)
 
 	return payment_entry.name
 
@@ -616,12 +581,7 @@ def cancel_credit_journal_entries(invoice_name):
 
 	# Find linked journal entries
 	linked_journal_entries = frappe.get_all(
-		"Journal Entry",
-		filters={
-			"docstatus": 1,
-			"user_remark": remark
-		},
-		pluck="name"
+		"Journal Entry", filters={"docstatus": 1, "user_remark": remark}, pluck="name"
 	)
 
 	cancelled_count = 0
@@ -643,14 +603,13 @@ def cancel_credit_journal_entries(invoice_name):
 			cancelled_count += 1
 		except Exception as e:
 			frappe.log_error(
-				f"Failed to cancel Journal Entry {journal_entry_name}: {str(e)}",
-				"Credit Sale JE Cancellation"
+				f"Failed to cancel Journal Entry {journal_entry_name}: {e!s}",
+				"Credit Sale JE Cancellation",
 			)
 
 	if cancelled_count > 0:
 		frappe.msgprint(
-			_("Cancelled {0} credit redemption journal entries").format(cancelled_count),
-			alert=True
+			_("Cancelled {0} credit redemption journal entries").format(cancelled_count), alert=True
 		)
 
 	return cancelled_count
@@ -671,7 +630,8 @@ def get_credit_sale_summary(pos_profile):
 		frappe.throw(_("POS Profile is required"))
 
 	# Get credit sales (outstanding > 0)
-	summary = frappe.db.sql("""
+	summary = frappe.db.sql(
+		"""
 		SELECT
 			COUNT(*) as count,
 			SUM(outstanding_amount) as total_outstanding,
@@ -685,14 +645,12 @@ def get_credit_sale_summary(pos_profile):
 			AND is_pos = 1
 			AND outstanding_amount > 0
 			AND is_return = 0
-	""", {"pos_profile": pos_profile}, as_dict=True)
+	""",
+		{"pos_profile": pos_profile},
+		as_dict=True,
+	)
 
-	return summary[0] if summary else {
-		"count": 0,
-		"total_outstanding": 0,
-		"total_amount": 0,
-		"total_paid": 0
-	}
+	return summary[0] if summary else {"count": 0, "total_outstanding": 0, "total_amount": 0, "total_paid": 0}
 
 
 @frappe.whitelist()
@@ -711,16 +669,14 @@ def get_credit_invoices(pos_profile, limit=100):
 		frappe.throw(_("POS Profile is required"))
 
 	# Check if user has access to this POS Profile
-	has_access = frappe.db.exists(
-		"POS Profile User",
-		{"parent": pos_profile, "user": frappe.session.user}
-	)
+	has_access = frappe.db.exists("POS Profile User", {"parent": pos_profile, "user": frappe.session.user})
 
 	if not has_access and not frappe.has_permission("Sales Invoice", "read"):
 		frappe.throw(_("You don't have access to this POS Profile"))
 
 	# Query for credit invoices
-	invoices = frappe.db.sql("""
+	invoices = frappe.db.sql(
+		"""
 		SELECT
 			name,
 			customer,
@@ -744,9 +700,9 @@ def get_credit_invoices(pos_profile, limit=100):
 			posting_date DESC,
 			posting_time DESC
 		LIMIT %(limit)s
-	""", {
-		"pos_profile": pos_profile,
-		"limit": limit
-	}, as_dict=True)
+	""",
+		{"pos_profile": pos_profile, "limit": limit},
+		as_dict=True,
+	)
 
 	return invoices
diff --git a/pos_next/api/customers.py b/pos_next/api/customers.py
index 70209123..20912397 100644
--- a/pos_next/api/customers.py
+++ b/pos_next/api/customers.py
@@ -9,257 +9,246 @@
 
 @frappe.whitelist()
 def get_customers(search_term="", pos_profile=None, limit=20, modified_since=None):
-
-    """
-    Search customers for inline customer selection in POS.
-
-    Args:
-        search_term (str): Search query (name, mobile, or customer ID)
-        pos_profile (str): POS Profile to filter by customer group
-        limit (int): Maximum number of results to return
-        modified_since (str): Fetch customers modified after this timestamp (ISO format)
-
-    Returns:
-        list: List of customer dictionaries with name, customer_name, mobile_no, email_id, disabled
-    """
-    try:
-        frappe.logger().debug(
-            f"get_customers called with search_term={search_term}, pos_profile={pos_profile}, limit={limit}, modified_since={modified_since}"
-        )
-
-        filters = {}
-        or_filters = []
-
-        # Filter by POS Profile customer group if specified
-        if pos_profile:
-            frappe.logger().debug(f"Loading POS Profile: {pos_profile}")
-            profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
-            # Check if customer_group field exists (it may not exist in all versions)
-            if hasattr(profile_doc, "customer_group") and profile_doc.customer_group:
-                filters["customer_group"] = profile_doc.customer_group
-                frappe.logger().debug(f"Filtering by customer_group: {profile_doc.customer_group}")
-
-        if modified_since:
-            # Delta sync: include disabled customers so frontend can purge them
-            filters["modified"] = [">=", modified_since]
-        else:
-            # Full fetch: only active customers
-            filters["disabled"] = 0
-
-        search_term = (search_term or "").strip()
-        if search_term:
-            like_term = f"%{search_term}%"
-            or_filters = [
-                ["Customer", "name", "like", like_term],
-                ["Customer", "customer_name", "like", like_term],
-                ["Customer", "mobile_no", "like", like_term],
-                ["Customer", "email_id", "like", like_term],
-            ]
-
-        customer_limit = limit if limit not in (None, 0) else frappe.db.count("Customer", filters)
-        result = frappe.get_all(
-            "Customer",
-            filters=filters,
-            or_filters=or_filters or None,
-            fields=["name", "customer_name", "mobile_no", "email_id", "disabled"],
-            limit=customer_limit,
-            order_by="customer_name asc",
-        )
-        frappe.logger().debug(f"get_customers returned {len(result)} customers")
-        return result
-    except Exception as e:
-        frappe.logger().error(f"Error in get_customers: {str(e)}")
-        frappe.logger().error(frappe.get_traceback())
-        frappe.throw(_("Error fetching customers: {0}").format(str(e)))
+	"""
+	Search customers for inline customer selection in POS.
+
+	Args:
+	    search_term (str): Search query (name, mobile, or customer ID)
+	    pos_profile (str): POS Profile to filter by customer group
+	    limit (int): Maximum number of results to return
+	    modified_since (str): Fetch customers modified after this timestamp (ISO format)
+
+	Returns:
+	    list: List of customer dictionaries with name, customer_name, mobile_no, email_id, disabled
+	"""
+	try:
+		frappe.logger().debug(
+			f"get_customers called with search_term={search_term}, pos_profile={pos_profile}, limit={limit}, modified_since={modified_since}"
+		)
+
+		filters = {}
+		or_filters = []
+
+		# Filter by POS Profile customer group if specified
+		if pos_profile:
+			frappe.logger().debug(f"Loading POS Profile: {pos_profile}")
+			profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
+			# Check if customer_group field exists (it may not exist in all versions)
+			if hasattr(profile_doc, "customer_group") and profile_doc.customer_group:
+				filters["customer_group"] = profile_doc.customer_group
+				frappe.logger().debug(f"Filtering by customer_group: {profile_doc.customer_group}")
+
+		if modified_since:
+			# Delta sync: include disabled customers so frontend can purge them
+			filters["modified"] = [">=", modified_since]
+		else:
+			# Full fetch: only active customers
+			filters["disabled"] = 0
+
+		search_term = (search_term or "").strip()
+		if search_term:
+			like_term = f"%{search_term}%"
+			or_filters = [
+				["Customer", "name", "like", like_term],
+				["Customer", "customer_name", "like", like_term],
+				["Customer", "mobile_no", "like", like_term],
+				["Customer", "email_id", "like", like_term],
+			]
+
+		customer_limit = limit if limit not in (None, 0) else frappe.db.count("Customer", filters)
+		result = frappe.get_all(
+			"Customer",
+			filters=filters,
+			or_filters=or_filters or None,
+			fields=["name", "customer_name", "mobile_no", "email_id", "disabled"],
+			limit=customer_limit,
+			order_by="customer_name asc",
+		)
+		frappe.logger().debug(f"get_customers returned {len(result)} customers")
+		return result
+	except Exception as e:
+		frappe.logger().error(f"Error in get_customers: {e!s}")
+		frappe.logger().error(frappe.get_traceback())
+		frappe.throw(_("Error fetching customers: {0}").format(str(e)))
 
 
 @frappe.whitelist()
 def create_customer(
-    customer_name,
-    mobile_no=None,
-    email_id=None,
-    customer_group="Individual",
-    territory="All Territories",
-    company=None,
-    pos_profile=None,
+	customer_name,
+	mobile_no=None,
+	email_id=None,
+	customer_group="Individual",
+	territory="All Territories",
+	company=None,
+	pos_profile=None,
 ):
-    """
-    Create a new customer from POS.
-
-    Args:
-        customer_name (str): Customer name (required)
-        mobile_no (str): Mobile number (optional)
-        email_id (str): Email address (optional)
-        customer_group (str): Customer group (default: Individual)
-        territory (str): Territory (default: All Territories)
-        company (str): Company (optional, used to auto-assign loyalty program)
-        pos_profile (str): POS Profile (optional, preferred for context-aware loyalty assignment)
-
-    Returns:
-        dict: Created customer document
-    """
-    # Check if user has permission to create customers
-    if not frappe.has_permission("Customer", "create"):
-        frappe.throw(_("You don't have permission to create customers"), frappe.PermissionError)
-
-    if not customer_name:
-        frappe.throw(_("Customer name is required"))
-
-    loyalty_program = get_default_loyalty_program_from_settings(
-        company=company,
-        pos_profile=pos_profile,
-    )
-
-    customer = frappe.get_doc(
-        {
-            "doctype": "Customer",
-            "customer_name": customer_name,
-            "customer_type": "Individual",
-            "customer_group": customer_group or "Individual",
-            "territory": territory or "All Territories",
-            "mobile_no": mobile_no or "",
-            "email_id": email_id or "",
-            "loyalty_program": loyalty_program,
-        }
-    )
-
-    frappe.flags.pos_next_customer_company = company
-    frappe.flags.pos_next_customer_pos_profile = pos_profile
-    try:
-        customer.insert()
-    finally:
-        frappe.flags.pos_next_customer_company = None
-        frappe.flags.pos_next_customer_pos_profile = None
-
-    return customer.as_dict()
+	"""
+	Create a new customer from POS.
+
+	Args:
+	    customer_name (str): Customer name (required)
+	    mobile_no (str): Mobile number (optional)
+	    email_id (str): Email address (optional)
+	    customer_group (str): Customer group (default: Individual)
+	    territory (str): Territory (default: All Territories)
+	    company (str): Company (optional, used to auto-assign loyalty program)
+	    pos_profile (str): POS Profile (optional, preferred for context-aware loyalty assignment)
+
+	Returns:
+	    dict: Created customer document
+	"""
+	# Check if user has permission to create customers
+	if not frappe.has_permission("Customer", "create"):
+		frappe.throw(_("You don't have permission to create customers"), frappe.PermissionError)
+
+	if not customer_name:
+		frappe.throw(_("Customer name is required"))
+
+	loyalty_program = get_default_loyalty_program_from_settings(
+		company=company,
+		pos_profile=pos_profile,
+	)
+
+	customer = frappe.get_doc(
+		{
+			"doctype": "Customer",
+			"customer_name": customer_name,
+			"customer_type": "Individual",
+			"customer_group": customer_group or "Individual",
+			"territory": territory or "All Territories",
+			"mobile_no": mobile_no or "",
+			"email_id": email_id or "",
+			"loyalty_program": loyalty_program,
+		}
+	)
+
+	frappe.flags.pos_next_customer_company = company
+	frappe.flags.pos_next_customer_pos_profile = pos_profile
+	try:
+		customer.insert()
+	finally:
+		frappe.flags.pos_next_customer_company = None
+		frappe.flags.pos_next_customer_pos_profile = None
+
+	return customer.as_dict()
 
 
 def get_default_loyalty_program(company):
-    """
-    Get the default loyalty program for a company.
-    Prefers programs with auto_opt_in enabled.
+	"""
+	Get the default loyalty program for a company.
+	Prefers programs with auto_opt_in enabled.
 
-    Args:
-        company (str): Company name
+	Args:
+	    company (str): Company name
 
-    Returns:
-        str: Loyalty program name or None
-    """
-    # First try to find a loyalty program with auto_opt_in for the company
-    loyalty_program = frappe.db.get_value(
-        "Loyalty Program",
-        {"company": company, "auto_opt_in": 1},
-        "name"
-    )
+	Returns:
+	    str: Loyalty program name or None
+	"""
+	# First try to find a loyalty program with auto_opt_in for the company
+	loyalty_program = frappe.db.get_value("Loyalty Program", {"company": company, "auto_opt_in": 1}, "name")
 
-    if loyalty_program:
-        return loyalty_program
+	if loyalty_program:
+		return loyalty_program
 
-    # Fallback: any loyalty program for the company
-    loyalty_program = frappe.db.get_value(
-        "Loyalty Program",
-        {"company": company},
-        "name"
-    )
+	# Fallback: any loyalty program for the company
+	loyalty_program = frappe.db.get_value("Loyalty Program", {"company": company}, "name")
 
-    return loyalty_program
+	return loyalty_program
 
 
 def auto_assign_loyalty_program(doc, method=None):
-    """
-    Auto-assign loyalty program to newly created customers.
-    Called as after_insert hook on Customer doctype.
-
-    Uses the default_loyalty_program from POS Settings.
-    If no loyalty program is configured in POS Settings, no auto-assignment occurs.
-
-    Args:
-        doc: Customer document
-        method: Hook method name (not used)
-    """
-    # Skip if customer already has a loyalty program
-    if doc.loyalty_program:
-        return
-
-    company, pos_profile = _get_customer_assignment_context()
-    loyalty_program = get_default_loyalty_program_from_settings(
-        company=company,
-        pos_profile=pos_profile,
-    )
-
-    if loyalty_program:
-        # Use db_set to avoid triggering validate hooks again
-        doc.db_set("loyalty_program", loyalty_program, update_modified=False)
-        frappe.logger().info(
-            f"Auto-assigned loyalty program '{loyalty_program}' to customer '{doc.name}'"
-        )
+	"""
+	Auto-assign loyalty program to newly created customers.
+	Called as after_insert hook on Customer doctype.
+
+	Uses the default_loyalty_program from POS Settings.
+	If no loyalty program is configured in POS Settings, no auto-assignment occurs.
+
+	Args:
+	    doc: Customer document
+	    method: Hook method name (not used)
+	"""
+	# Skip if customer already has a loyalty program
+	if doc.loyalty_program:
+		return
+
+	company, pos_profile = _get_customer_assignment_context()
+	loyalty_program = get_default_loyalty_program_from_settings(
+		company=company,
+		pos_profile=pos_profile,
+	)
+
+	if loyalty_program:
+		# Use db_set to avoid triggering validate hooks again
+		doc.db_set("loyalty_program", loyalty_program, update_modified=False)
+		frappe.logger().info(f"Auto-assigned loyalty program '{loyalty_program}' to customer '{doc.name}'")
 
 
 def _get_customer_assignment_context():
-    """Get company/profile context for customer auto-assignment from the current request."""
-    company = getattr(frappe.flags, "pos_next_customer_company", None)
-    pos_profile = getattr(frappe.flags, "pos_next_customer_pos_profile", None)
+	"""Get company/profile context for customer auto-assignment from the current request."""
+	company = getattr(frappe.flags, "pos_next_customer_company", None)
+	pos_profile = getattr(frappe.flags, "pos_next_customer_pos_profile", None)
 
-    form_dict = getattr(frappe.local, "form_dict", None)
-    if form_dict:
-        company = company or form_dict.get("company")
-        pos_profile = pos_profile or form_dict.get("pos_profile")
+	form_dict = getattr(frappe.local, "form_dict", None)
+	if form_dict:
+		company = company or form_dict.get("company")
+		pos_profile = pos_profile or form_dict.get("pos_profile")
 
-    return company, pos_profile
+	return company, pos_profile
 
 
 def get_default_loyalty_program_from_settings(company=None, pos_profile=None):
-    """
-    Get the default loyalty program from POS Settings using explicit context.
-    Returns a program only when the company/profile context is clear enough to avoid
-    assigning the wrong loyalty program.
-
-    Returns:
-        str: Loyalty program name or None if not configured
-    """
-    if pos_profile:
-        pos_settings = frappe.db.get_value(
-            "POS Settings",
-            {"enabled": 1, "pos_profile": pos_profile},
-            "default_loyalty_program",
-        )
-        return pos_settings or None
-
-    if not company:
-        return None
-
-    pos_settings = frappe.get_all(
-        "POS Settings",
-        filters={"enabled": 1, "default_loyalty_program": ["is", "set"]},
-        fields=["pos_profile", "default_loyalty_program"],
-        order_by="modified desc",
-    )
-
-    company_programs = []
-    for row in pos_settings:
-        profile_company = frappe.get_cached_value("POS Profile", row.pos_profile, "company")
-        if profile_company == company:
-            company_programs.append(row.default_loyalty_program)
-
-    unique_programs = list(dict.fromkeys(program for program in company_programs if program))
-    if len(unique_programs) == 1:
-        return unique_programs[0]
-
-    return None
+	"""
+	Get the default loyalty program from POS Settings using explicit context.
+	Returns a program only when the company/profile context is clear enough to avoid
+	assigning the wrong loyalty program.
+
+	Returns:
+	    str: Loyalty program name or None if not configured
+	"""
+	if pos_profile:
+		pos_settings = frappe.db.get_value(
+			"POS Next Settings",
+			{"enabled": 1, "pos_profile": pos_profile},
+			"default_loyalty_program",
+		)
+		return pos_settings or None
+
+	if not company:
+		return None
+
+	pos_settings = frappe.get_all(
+		"POS Next Settings",
+		filters={"enabled": 1, "default_loyalty_program": ["is", "set"]},
+		fields=["pos_profile", "default_loyalty_program"],
+		order_by="modified desc",
+	)
+
+	company_programs = []
+	for row in pos_settings:
+		profile_company = frappe.get_cached_value("POS Profile", row.pos_profile, "company")
+		if profile_company == company:
+			company_programs.append(row.default_loyalty_program)
+
+	unique_programs = list(dict.fromkeys(program for program in company_programs if program))
+	if len(unique_programs) == 1:
+		return unique_programs[0]
+
+	return None
 
 
 @frappe.whitelist()
 def get_customer_details(customer):
-    """
-    Get detailed customer information.
+	"""
+	Get detailed customer information.
 
-    Args:
-        customer (str): Customer ID
+	Args:
+	    customer (str): Customer ID
 
-    Returns:
-        dict: Customer details
-    """
-    if not customer:
-        frappe.throw(_("Customer is required"))
+	Returns:
+	    dict: Customer details
+	"""
+	if not customer:
+		frappe.throw(_("Customer is required"))
 
-    return frappe.get_cached_doc("Customer", customer).as_dict()
+	return frappe.get_cached_doc("Customer", customer).as_dict()
diff --git a/pos_next/api/invoices.py b/pos_next/api/invoices.py
index e56fd3fb..1cdeaea2 100644
--- a/pos_next/api/invoices.py
+++ b/pos_next/api/invoices.py
@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2025, BrainWise and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
+
 import json
 from functools import lru_cache
+
 import frappe
-from frappe import _
-from frappe.utils import flt, cint, nowdate, nowtime, get_datetime, cstr
-from erpnext.stock.doctype.batch.batch import get_batch_qty, get_batch_no
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
-
+from erpnext.stock.doctype.batch.batch import get_batch_no, get_batch_qty
+from frappe import _
+from frappe.utils import cint, cstr, flt, get_datetime, nowdate, nowtime
 
 # ==========================================
 # Constants for field names (avoid typos and enable refactoring)
@@ -28,21 +27,21 @@
 
 # Doctypes
 DOCTYPE_SALES_INVOICE = "Sales Invoice"
-DOCTYPE_POS_SETTINGS = "POS Settings"
+DOCTYPE_POS_SETTINGS = "POS Next Settings"
 DOCTYPE_POS_PROFILE = "POS Profile"
 DOCTYPE_COMMENT = "Comment"
 
 
 try:
-    from erpnext.accounts.doctype.pricing_rule.pricing_rule import (
-        apply_pricing_rule as erpnext_apply_pricing_rule,
-    )
-    from erpnext.accounts.doctype.pricing_rule.utils import (
-        get_applied_pricing_rules as erpnext_get_applied_pricing_rules,
-    )
+	from erpnext.accounts.doctype.pricing_rule.pricing_rule import (
+		apply_pricing_rule as erpnext_apply_pricing_rule,
+	)
+	from erpnext.accounts.doctype.pricing_rule.utils import (
+		get_applied_pricing_rules as erpnext_get_applied_pricing_rules,
+	)
 except Exception:  # pragma: no cover - ERPNext not installed in some environments
-    erpnext_apply_pricing_rule = None
-    erpnext_get_applied_pricing_rules = None
+	erpnext_apply_pricing_rule = None
+	erpnext_get_applied_pricing_rules = None
 
 
 # ==========================================
@@ -51,248 +50,245 @@
 
 
 def calculate_price_list_rate(item_rate, discount_pct, current_price_list_rate):
-    """
-    Calculate price_list_rate from discounted rate and discount percentage.
+	"""
+	Calculate price_list_rate from discounted rate and discount percentage.
 
-    Formula: rate = price_list_rate * (1 - discount_percentage/100)
-    Reverse: price_list_rate = rate / (1 - discount_percentage/100)
+	Formula: rate = price_list_rate * (1 - discount_percentage/100)
+	Reverse: price_list_rate = rate / (1 - discount_percentage/100)
 
-    Args:
-        item_rate: The current item rate (after discount)
-        discount_pct: The discount percentage (0-100)
-        current_price_list_rate: The existing price_list_rate if any
+	Args:
+	    item_rate: The current item rate (after discount)
+	    discount_pct: The discount percentage (0-100)
+	    current_price_list_rate: The existing price_list_rate if any
 
-    Returns:
-        float: The calculated price_list_rate
-    """
-    # Early exit: no discount applied
-    if discount_pct <= 0 or discount_pct >= 100:
-        return current_price_list_rate if current_price_list_rate else item_rate
+	Returns:
+	    float: The calculated price_list_rate
+	"""
+	# Early exit: no discount applied
+	if discount_pct <= 0 or discount_pct >= 100:
+		return current_price_list_rate if current_price_list_rate else item_rate
 
-    # Reverse-calculate price_list_rate from discounted rate
-    if item_rate > 0:
-        discount_multiplier = 1 - discount_pct / 100
-        return item_rate / discount_multiplier
+	# Reverse-calculate price_list_rate from discounted rate
+	if item_rate > 0:
+		discount_multiplier = 1 - discount_pct / 100
+		return item_rate / discount_multiplier
 
-    return current_price_list_rate if current_price_list_rate else item_rate
+	return current_price_list_rate if current_price_list_rate else item_rate
 
 
 def validate_manual_rate_edit(item, pos_profile=None, pos_settings_cache=None):
-    """
-    Validate manually edited item rates against POS Settings business rules.
-
-    This function enforces:
-    1. Rate must be positive
-    2. Rate editing must be enabled in POS Settings
-    3. Rate reduction must not exceed max_discount_allowed (if configured)
-
-    Args:
-        item: The item dict/object with rate information. Must contain:
-            - is_rate_manually_edited: Flag indicating manual edit (1 or 0)
-            - item_code: The item code for error messages
-            - rate: The edited rate
-            - original_rate or price_list_rate: The original catalog price
-        pos_profile: POS Profile name for settings lookup. Required for manual edits.
-        pos_settings_cache: Optional pre-fetched POS Settings dict to avoid repeated DB queries.
-            Should contain: allow_user_to_edit_rate, max_discount_allowed
-
-    Returns:
-        dict with 'valid' boolean and 'message' string if invalid
-    """
-    is_manual_edit = cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED) or 0)
-
-    # Skip validation if not a manual edit
-    if not is_manual_edit:
-        return {"valid": True}
-
-    item_code = item.get(FIELD_ITEM_CODE)
-    item_rate = flt(item.get(FIELD_RATE) or 0)
-    original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
-
-    # Validate rate is positive
-    if item_rate <= 0:
-        return {
-            "valid": False,
-            "message": _("Rate for item {0} must be greater than zero").format(item_code)
-        }
-
-    # POS Profile is required for manual rate edit validation
-    if not pos_profile:
-        return {
-            "valid": False,
-            "message": _("POS Profile is required to validate rate edit for item {0}").format(item_code)
-        }
-
-    # Use cached POS Settings if provided, otherwise fetch from DB
-    pos_settings = pos_settings_cache
-    if pos_settings is None:
-        pos_settings = frappe.db.get_value(
-            DOCTYPE_POS_SETTINGS,
-            {"pos_profile": pos_profile},
-            [FIELD_ALLOW_USER_TO_EDIT_RATE, FIELD_MAX_DISCOUNT_ALLOWED],
-            as_dict=True
-        )
-
-    # Check if POS Settings exists
-    if not pos_settings:
-        return {
-            "valid": False,
-            "message": _("POS Settings not found for profile {0}. Cannot validate rate edit.").format(pos_profile)
-        }
-
-    # Check if rate editing is allowed
-    if not cint(pos_settings.get(FIELD_ALLOW_USER_TO_EDIT_RATE)):
-        return {
-            "valid": False,
-            "message": _("Rate editing is not allowed for this POS Profile")
-        }
-
-    # Validate against max discount if configured and rate is reduced
-    max_discount = flt(pos_settings.get(FIELD_MAX_DISCOUNT_ALLOWED) or 0)
-    if max_discount > 0 and original_rate > 0 and item_rate < original_rate:
-        # Calculate effective discount percentage
-        discount_pct = round(((original_rate - item_rate) / original_rate) * 100, 2)
-        if discount_pct > max_discount:
-            return {
-                "valid": False,
-                "message": _("Rate reduction for item {0} is {1}% which exceeds the maximum allowed discount of {2}%").format(
-                    item_code, discount_pct, max_discount
-                )
-            }
-
-    return {"valid": True}
+	"""
+	Validate manually edited item rates against POS Settings business rules.
+
+	This function enforces:
+	1. Rate must be positive
+	2. Rate editing must be enabled in POS Settings
+	3. Rate reduction must not exceed max_discount_allowed (if configured)
+
+	Args:
+	    item: The item dict/object with rate information. Must contain:
+	        - is_rate_manually_edited: Flag indicating manual edit (1 or 0)
+	        - item_code: The item code for error messages
+	        - rate: The edited rate
+	        - original_rate or price_list_rate: The original catalog price
+	    pos_profile: POS Profile name for settings lookup. Required for manual edits.
+	    pos_settings_cache: Optional pre-fetched POS Settings dict to avoid repeated DB queries.
+	        Should contain: allow_user_to_edit_rate, max_discount_allowed
+
+	Returns:
+	    dict with 'valid' boolean and 'message' string if invalid
+	"""
+	is_manual_edit = cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED) or 0)
+
+	# Skip validation if not a manual edit
+	if not is_manual_edit:
+		return {"valid": True}
+
+	item_code = item.get(FIELD_ITEM_CODE)
+	item_rate = flt(item.get(FIELD_RATE) or 0)
+	original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
+
+	# Validate rate is positive
+	if item_rate <= 0:
+		return {"valid": False, "message": _("Rate for item {0} must be greater than zero").format(item_code)}
+
+	# POS Profile is required for manual rate edit validation
+	if not pos_profile:
+		return {
+			"valid": False,
+			"message": _("POS Profile is required to validate rate edit for item {0}").format(item_code),
+		}
+
+	# Use cached POS Settings if provided, otherwise fetch from DB
+	pos_settings = pos_settings_cache
+	if pos_settings is None:
+		pos_settings = frappe.db.get_value(
+			DOCTYPE_POS_SETTINGS,
+			{"pos_profile": pos_profile},
+			[FIELD_ALLOW_USER_TO_EDIT_RATE, FIELD_MAX_DISCOUNT_ALLOWED],
+			as_dict=True,
+		)
+
+	# Check if POS Settings exists
+	if not pos_settings:
+		return {
+			"valid": False,
+			"message": _("POS Settings not found for profile {0}. Cannot validate rate edit.").format(
+				pos_profile
+			),
+		}
+
+	# Check if rate editing is allowed
+	if not cint(pos_settings.get(FIELD_ALLOW_USER_TO_EDIT_RATE)):
+		return {"valid": False, "message": _("Rate editing is not allowed for this POS Profile")}
+
+	# Validate against max discount if configured and rate is reduced
+	max_discount = flt(pos_settings.get(FIELD_MAX_DISCOUNT_ALLOWED) or 0)
+	if max_discount > 0 and original_rate > 0 and item_rate < original_rate:
+		# Calculate effective discount percentage
+		discount_pct = round(((original_rate - item_rate) / original_rate) * 100, 2)
+		if discount_pct > max_discount:
+			return {
+				"valid": False,
+				"message": _(
+					"Rate reduction for item {0} is {1}% which exceeds the maximum allowed discount of {2}%"
+				).format(item_code, discount_pct, max_discount),
+			}
+
+	return {"valid": True}
 
 
 def log_manual_rate_edit(item, invoice_name, user=None):
-    """
-    Create an audit log entry for manual rate edits.
-
-    This function creates a Comment on the Sales Invoice documenting the rate change.
-    It should only be called ONCE per item, after the invoice is successfully submitted.
-
-    Args:
-        item: The item dict/object with rate information. Must contain:
-            - is_rate_manually_edited: Flag indicating manual edit (1 or 0)
-            - item_code: The item code
-            - rate: The new/edited rate
-            - original_rate: The original price before edit (or price_list_rate as fallback)
-        invoice_name: The Sales Invoice document name
-        user: Optional user who made the edit (defaults to session user)
-
-    Returns:
-        None
-    """
-    # Only log if rate was manually edited
-    if not cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED)):
-        return
-
-    user = user or frappe.session.user
-    item_code = item.get(FIELD_ITEM_CODE)
-    original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
-    new_rate = flt(item.get(FIELD_RATE) or 0)
-
-    # Skip logging if rates are the same (no actual change)
-    if original_rate == new_rate:
-        return
-
-    # Calculate discount/markup percentage for logging
-    change_pct = 0
-    change_type = "reduction"
-    if original_rate > 0:
-        change_pct = round(abs((original_rate - new_rate) / original_rate) * 100, 2)
-        if new_rate > original_rate:
-            change_type = "increase"
-
-    # Create audit comment on the invoice
-    frappe.get_doc({
-        "doctype": DOCTYPE_COMMENT,
-        "comment_type": "Comment",
-        "reference_doctype": DOCTYPE_SALES_INVOICE,
-        "reference_name": invoice_name,
-        "content": _("Manual rate edit by {user}: Item {item_code} rate changed from {original} to {new} ({change_pct}% {change_type})").format(
-            user=user,
-            item_code=item_code,
-            original=frappe.format_value(original_rate, {"fieldtype": "Currency"}),
-            new=frappe.format_value(new_rate, {"fieldtype": "Currency"}),
-            change_pct=change_pct,
-            change_type=change_type
-        )
-    }).insert(ignore_permissions=True)
+	"""
+	Create an audit log entry for manual rate edits.
+
+	This function creates a Comment on the Sales Invoice documenting the rate change.
+	It should only be called ONCE per item, after the invoice is successfully submitted.
+
+	Args:
+	    item: The item dict/object with rate information. Must contain:
+	        - is_rate_manually_edited: Flag indicating manual edit (1 or 0)
+	        - item_code: The item code
+	        - rate: The new/edited rate
+	        - original_rate: The original price before edit (or price_list_rate as fallback)
+	    invoice_name: The Sales Invoice document name
+	    user: Optional user who made the edit (defaults to session user)
+
+	Returns:
+	    None
+	"""
+	# Only log if rate was manually edited
+	if not cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED)):
+		return
+
+	user = user or frappe.session.user
+	item_code = item.get(FIELD_ITEM_CODE)
+	original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
+	new_rate = flt(item.get(FIELD_RATE) or 0)
+
+	# Skip logging if rates are the same (no actual change)
+	if original_rate == new_rate:
+		return
+
+	# Calculate discount/markup percentage for logging
+	change_pct = 0
+	change_type = "reduction"
+	if original_rate > 0:
+		change_pct = round(abs((original_rate - new_rate) / original_rate) * 100, 2)
+		if new_rate > original_rate:
+			change_type = "increase"
+
+	# Create audit comment on the invoice
+	frappe.get_doc(
+		{
+			"doctype": DOCTYPE_COMMENT,
+			"comment_type": "Comment",
+			"reference_doctype": DOCTYPE_SALES_INVOICE,
+			"reference_name": invoice_name,
+			"content": _(
+				"Manual rate edit by {user}: Item {item_code} rate changed from {original} to {new} ({change_pct}% {change_type})"
+			).format(
+				user=user,
+				item_code=item_code,
+				original=frappe.format_value(original_rate, {"fieldtype": "Currency"}),
+				new=frappe.format_value(new_rate, {"fieldtype": "Currency"}),
+				change_pct=change_pct,
+				change_type=change_type,
+			),
+		}
+	).insert(ignore_permissions=True)
 
 
 def standardize_pricing_rules(items):
-    """
-    Standardize pricing_rules field on invoice items.
-    ERPNext expects a comma-separated string, but frontend/offline may send:
-    - Python list: ["PRLE-0001", "PRLE-0002"]
-    - JSON string: '["PRLE-0001"]' or '[\\n "PRLE-0001"\\n]'
+	"""
+	Standardize pricing_rules field on invoice items.
+	ERPNext expects a comma-separated string, but frontend/offline may send:
+	- Python list: ["PRLE-0001", "PRLE-0002"]
+	- JSON string: '["PRLE-0001"]' or '[\\n "PRLE-0001"\\n]'
 
-    Args:
-        items: List of item dicts to standardize (modified in place)
-    """
-    for item in items or []:
-        pricing_rules = item.get("pricing_rules")
-        if not pricing_rules:
-            continue
+	Args:
+	    items: List of item dicts to standardize (modified in place)
+	"""
+	for item in items or []:
+		pricing_rules = item.get("pricing_rules")
+		if not pricing_rules:
+			continue
 
-        item["pricing_rules"] = _pricing_rule_to_string(pricing_rules)
+		item["pricing_rules"] = _pricing_rule_to_string(pricing_rules)
 
 
 def _pricing_rule_to_string(value):
-    """
-    Convert pricing_rules value to comma-separated string.
-    Returns empty string if value is invalid/unparseable.
-    """
-    if not value:
-        return ""
-
-    # Already a list - join it
-    if isinstance(value, list):
-        return ",".join(str(r) for r in value if r)
-
-    # Must be a string at this point
-    if not isinstance(value, str):
-        return ""
-
-    stripped = value.strip()
-
-    # Not JSON-like - return as-is (already a string like "PRLE-0001,PRLE-0002")
-    if not stripped.startswith("["):
-        return stripped
-
-    # Try to parse JSON array
-    try:
-        parsed = json.loads(stripped)
-        if isinstance(parsed, list):
-            return ",".join(str(r) for r in parsed if r)
-    except (json.JSONDecodeError, TypeError, ValueError):
-        # Malformed JSON that looks like array - clear it to prevent issues
-        frappe.log_error(
-            f"Invalid pricing_rules JSON: {stripped[:100]}",
-            "Pricing Rules Normalization"
-        )
-        return ""
-
-    return ""
+	"""
+	Convert pricing_rules value to comma-separated string.
+	Returns empty string if value is invalid/unparseable.
+	"""
+	if not value:
+		return ""
+
+	# Already a list - join it
+	if isinstance(value, list):
+		return ",".join(str(r) for r in value if r)
+
+	# Must be a string at this point
+	if not isinstance(value, str):
+		return ""
+
+	stripped = value.strip()
+
+	# Not JSON-like - return as-is (already a string like "PRLE-0001,PRLE-0002")
+	if not stripped.startswith("["):
+		return stripped
+
+	# Try to parse JSON array
+	try:
+		parsed = json.loads(stripped)
+		if isinstance(parsed, list):
+			return ",".join(str(r) for r in parsed if r)
+	except (json.JSONDecodeError, TypeError, ValueError):
+		# Malformed JSON that looks like array - clear it to prevent issues
+		frappe.log_error(f"Invalid pricing_rules JSON: {stripped[:100]}", "Pricing Rules Normalization")
+		return ""
+
+	return ""
 
 
 def get_payment_account(mode_of_payment, company):
-    """
-    Get account for mode of payment.
-    Tries multiple fallback methods to find a suitable account.
-    """
-    # Try 1: Mode of Payment Account table
-    account = frappe.db.get_value(
-        "Mode of Payment Account",
-        {"parent": mode_of_payment, "company": company},
-        "default_account",
-    )
-    if account:
-        return {"account": account}
-
-    # Try 2: POS Payment Method from POS Profile
-    account = frappe.db.sql(
-        """
+	"""
+	Get account for mode of payment.
+	Tries multiple fallback methods to find a suitable account.
+	"""
+	# Try 1: Mode of Payment Account table
+	account = frappe.db.get_value(
+		"Mode of Payment Account",
+		{"parent": mode_of_payment, "company": company},
+		"default_account",
+	)
+	if account:
+		return {"account": account}
+
+	# Try 2: POS Payment Method from POS Profile
+	account = frappe.db.sql(
+		"""
 		SELECT ppm.default_account
 		FROM `tabPOS Payment Method` ppm
 		INNER JOIN `tabPOS Profile` pp ON ppm.parent = pp.name
@@ -301,69 +297,69 @@ def get_payment_account(mode_of_payment, company):
 		AND ppm.default_account IS NOT NULL
 		LIMIT 1
 	""",
-        (mode_of_payment, company),
-        as_dict=1,
-    )
-
-    if account and account[0].default_account:
-        return {"account": account[0].default_account}
-
-    # Try 3: Company default cash account (for cash payments)
-    if "cash" in mode_of_payment.lower():
-        account = frappe.get_value("Company", company, "default_cash_account")
-        if account:
-            return {"account": account}
-
-    # Try 4: Company default bank account
-    account = frappe.get_value("Company", company, "default_bank_account")
-    if account:
-        return {"account": account}
-
-    # Try 5: Any Cash/Bank account for the company
-    account = frappe.db.get_value(
-        "Account",
-        {"company": company, "account_type": ["in", ["Cash", "Bank"]], "is_group": 0},
-        "name",
-    )
-    if account:
-        return {"account": account}
-
-    # No account found - throw error
-    frappe.throw(
-        _(
-            "Please set default Cash or Bank account in Mode of Payment {0} or set default accounts in Company {1}"
-        ).format(mode_of_payment, company),
-        title=_("Missing Account"),
-    )
+		(mode_of_payment, company),
+		as_dict=1,
+	)
+
+	if account and account[0].default_account:
+		return {"account": account[0].default_account}
+
+	# Try 3: Company default cash account (for cash payments)
+	if "cash" in mode_of_payment.lower():
+		account = frappe.get_value("Company", company, "default_cash_account")
+		if account:
+			return {"account": account}
+
+	# Try 4: Company default bank account
+	account = frappe.get_value("Company", company, "default_bank_account")
+	if account:
+		return {"account": account}
+
+	# Try 5: Any Cash/Bank account for the company
+	account = frappe.db.get_value(
+		"Account",
+		{"company": company, "account_type": ["in", ["Cash", "Bank"]], "is_group": 0},
+		"name",
+	)
+	if account:
+		return {"account": account}
+
+	# No account found - throw error
+	frappe.throw(
+		_(
+			"Please set default Cash or Bank account in Mode of Payment {0} or set default accounts in Company {1}"
+		).format(mode_of_payment, company),
+		title=_("Missing Account"),
+	)
 
 
 def _set_payment_accounts(payments, company):
-    """Set the account for each payment entry that is missing one.
-
-    Handles both Document objects (from invoice_doc.payments) and plain dicts
-    (from frontend data).  Document objects use BaseDocument.set() which writes
-    directly to __dict__, while plain dicts use normal key assignment.
-    """
-    if not payments or not company:
-        return
-
-    for payment in payments:
-        mode_of_payment = payment.get("mode_of_payment")
-        if not mode_of_payment or payment.get("account"):
-            continue
-        try:
-            account_info = get_payment_account(mode_of_payment, company)
-            if account_info:
-                account = account_info.get("account")
-                if hasattr(payment, "set") and callable(payment.set):
-                    payment.set("account", account)
-                else:
-                    payment["account"] = account
-        except Exception as e:
-            frappe.log_error(
-                f"Failed to get payment account for {mode_of_payment}: {e}",
-                "Payment Account Lookup",
-            )
+	"""Set the account for each payment entry that is missing one.
+
+	Handles both Document objects (from invoice_doc.payments) and plain dicts
+	(from frontend data).  Document objects use BaseDocument.set() which writes
+	directly to __dict__, while plain dicts use normal key assignment.
+	"""
+	if not payments or not company:
+		return
+
+	for payment in payments:
+		mode_of_payment = payment.get("mode_of_payment")
+		if not mode_of_payment or payment.get("account"):
+			continue
+		try:
+			account_info = get_payment_account(mode_of_payment, company)
+			if account_info:
+				account = account_info.get("account")
+				if hasattr(payment, "set") and callable(payment.set):
+					payment.set("account", account)
+				else:
+					payment["account"] = account
+		except Exception as e:
+			frappe.log_error(
+				f"Failed to get payment account for {mode_of_payment}: {e}",
+				"Payment Account Lookup",
+			)
 
 
 # ==========================================
@@ -372,168 +368,150 @@ def _set_payment_accounts(payments, company):
 
 
 def _get_available_stock(item):
-    """Return available stock qty for an item row."""
-    warehouse = item.get("warehouse")
-    batch_no = item.get("batch_no")
-    item_code = item.get("item_code")
+	"""Return available stock qty for an item row."""
+	warehouse = item.get("warehouse")
+	batch_no = item.get("batch_no")
+	item_code = item.get("item_code")
 
-    if not item_code or not warehouse:
-        return 0
+	if not item_code or not warehouse:
+		return 0
 
-    if batch_no:
-        return get_batch_qty(batch_no, warehouse) or 0
+	if batch_no:
+		return get_batch_qty(batch_no, warehouse) or 0
 
-    # Get stock from Bin
-    bin_qty = frappe.db.get_value(
-        "Bin", {"item_code": item_code, "warehouse": warehouse}, "actual_qty"
-    )
-    return flt(bin_qty) or 0
+	# Get stock from Bin
+	bin_qty = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "actual_qty")
+	return flt(bin_qty) or 0
 
 
 def _collect_stock_errors(items):
-    """Return list of items exceeding available stock.
-
-    Respects per-item allow_negative_stock if the field exists on Item.
-    """
-    allowed_items = _get_item_negative_stock_allow_set(items)
-    errors = []
-    for d in items:
-        if flt(d.get("qty")) < 0:
-            continue
-
-        available = _get_available_stock(d)
-        requested = flt(
-            d.get("stock_qty")
-            or (flt(d.get("qty")) * flt(d.get("conversion_factor") or 1))
-        )
-
-        if requested > available:
-            if d.get("item_code") in allowed_items:
-                continue
-            errors.append(
-                {
-                    "item_code": d.get("item_code"),
-                    "warehouse": d.get("warehouse"),
-                    "requested_qty": requested,
-                    "available_qty": available,
-                }
-            )
-
-    return errors
+	"""Return list of items exceeding available stock.
+
+	Respects per-item allow_negative_stock if the field exists on Item.
+	"""
+	allowed_items = _get_item_negative_stock_allow_set(items)
+	errors = []
+	for d in items:
+		if flt(d.get("qty")) < 0:
+			continue
+
+		available = _get_available_stock(d)
+		requested = flt(d.get("stock_qty") or (flt(d.get("qty")) * flt(d.get("conversion_factor") or 1)))
+
+		if requested > available:
+			if d.get("item_code") in allowed_items:
+				continue
+			errors.append(
+				{
+					"item_code": d.get("item_code"),
+					"warehouse": d.get("warehouse"),
+					"requested_qty": requested,
+					"available_qty": available,
+				}
+			)
+
+	return errors
 
 
 @lru_cache(maxsize=1)
 def _item_has_allow_negative_stock_field():
-    """Check whether Item doctype has an allow_negative_stock field."""
-    try:
-        return frappe.get_meta("Item").has_field("allow_negative_stock")
-    except Exception:
-        return False
+	"""Check whether Item doctype has an allow_negative_stock field."""
+	try:
+		return frappe.get_meta("Item").has_field("allow_negative_stock")
+	except Exception:
+		return False
 
 
 def _get_item_negative_stock_allow_set(items):
-    """Return set of item codes that allow negative stock at Item level."""
-    if not items or not _item_has_allow_negative_stock_field():
-        return set()
-
-    item_codes = list({d.get("item_code") for d in items if d.get("item_code")})
-    if not item_codes:
-        return set()
-
-    return set(frappe.get_all(
-        "Item",
-        filters={"name": ["in", item_codes], "allow_negative_stock": 1},
-        pluck="name",
-    ) or [])
+	"""Return set of item codes that allow negative stock at Item level."""
+	if not items or not _item_has_allow_negative_stock_field():
+		return set()
+
+	item_codes = list({d.get("item_code") for d in items if d.get("item_code")})
+	if not item_codes:
+		return set()
+
+	return set(
+		frappe.get_all(
+			"Item",
+			filters={"name": ["in", item_codes], "allow_negative_stock": 1},
+			pluck="name",
+		)
+		or []
+	)
 
 
 def _should_block(pos_profile):
-    """Check if sale should be blocked for insufficient stock."""
-    # First check global ERPNext Stock Settings
-    allow_negative = cint(
-        frappe.db.get_single_value("Stock Settings", "allow_negative_stock") or 0
-    )
-    if allow_negative:
-        return False
-
-    # Check POS Settings for the specific profile
-    if pos_profile:
-        # Check if POS Settings allows negative stock
-        pos_settings_allow_negative = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": pos_profile},
-                "allow_negative_stock"
-            ) or 0
-        )
-        if pos_settings_allow_negative:
-            return False
-
-        # Try to get custom field (may not exist in vanilla ERPNext)
-        block_sale = cint(
-            frappe.db.get_value(
-                "POS Profile", pos_profile, "posa_block_sale_beyond_available_qty"
-            )
-            or 1
-        )
-        return bool(block_sale)
-
-    # Default to blocking if no profile specified
-    return True
+	"""Check if sale should be blocked for insufficient stock."""
+	# First check global ERPNext Stock Settings
+	allow_negative = cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock") or 0)
+	if allow_negative:
+		return False
+
+	# Check POS Settings for the specific profile
+	if pos_profile:
+		# Check if POS Settings allows negative stock
+		pos_settings_allow_negative = cint(
+			frappe.db.get_value("POS Next Settings", {"pos_profile": pos_profile}, "allow_negative_stock")
+			or 0
+		)
+		if pos_settings_allow_negative:
+			return False
+
+		# Try to get custom field (may not exist in vanilla ERPNext)
+		block_sale = cint(
+			frappe.db.get_value("POS Profile", pos_profile, "posa_block_sale_beyond_available_qty") or 1
+		)
+		return bool(block_sale)
+
+	# Default to blocking if no profile specified
+	return True
 
 
 def _validate_stock_on_invoice(invoice_doc):
-    """Validate stock availability before submission."""
-    if invoice_doc.doctype == "Sales Invoice" and not cint(
-        getattr(invoice_doc, "update_stock", 0)
-    ):
-        return
+	"""Validate stock availability before submission."""
+	if invoice_doc.doctype == "Sales Invoice" and not cint(getattr(invoice_doc, "update_stock", 0)):
+		return
 
-    # Collect all stock items to check
-    items_to_check = [d.as_dict() for d in invoice_doc.items if d.get("is_stock_item")]
+	# Collect all stock items to check
+	items_to_check = [d.as_dict() for d in invoice_doc.items if d.get("is_stock_item")]
 
-    # Include packed items if present
-    if hasattr(invoice_doc, "packed_items"):
-        items_to_check.extend([d.as_dict() for d in invoice_doc.packed_items])
+	# Include packed items if present
+	if hasattr(invoice_doc, "packed_items"):
+		items_to_check.extend([d.as_dict() for d in invoice_doc.packed_items])
 
-    # Check for stock errors
-    errors = _collect_stock_errors(items_to_check)
+	# Check for stock errors
+	errors = _collect_stock_errors(items_to_check)
 
-    # Throw error if stock insufficient and blocking is enabled
-    if errors and _should_block(invoice_doc.pos_profile):
-        frappe.throw(frappe.as_json({"errors": errors}), frappe.ValidationError)
+	# Throw error if stock insufficient and blocking is enabled
+	if errors and _should_block(invoice_doc.pos_profile):
+		frappe.throw(frappe.as_json({"errors": errors}), frappe.ValidationError)
 
 
 def _auto_set_return_batches(invoice_doc):
-    """Assign batch numbers for return invoices without a source invoice.
-
-    When an item requires a batch number, this function allocates the first
-    available batch in FIFO order. If no batches exist in the selected
-    warehouse, an informative error is raised.
-    """
-    if not invoice_doc.get("is_return") or invoice_doc.get("return_against"):
-        return
-
-    for d in invoice_doc.items:
-        if not d.get("item_code") or not d.get("warehouse"):
-            continue
-
-        has_batch = frappe.db.get_value("Item", d.item_code, "has_batch_no")
-        if has_batch and not d.get("batch_no"):
-            batch_list = (
-                get_batch_qty(item_code=d.item_code, warehouse=d.warehouse) or []
-            )
-            batch_list = [b for b in batch_list if flt(b.get("qty")) > 0]
-
-            if batch_list:
-                # FIFO: batches are already sorted by posting/expiry in ERPNext
-                d.batch_no = batch_list[0].get("batch_no")
-            else:
-                frappe.throw(
-                    _("No batches available in {0} for {1}.").format(
-                        d.warehouse, d.item_code
-                    )
-                )
+	"""Assign batch numbers for return invoices without a source invoice.
+
+	When an item requires a batch number, this function allocates the first
+	available batch in FIFO order. If no batches exist in the selected
+	warehouse, an informative error is raised.
+	"""
+	if not invoice_doc.get("is_return") or invoice_doc.get("return_against"):
+		return
+
+	for d in invoice_doc.items:
+		if not d.get("item_code") or not d.get("warehouse"):
+			continue
+
+		has_batch = frappe.db.get_value("Item", d.item_code, "has_batch_no")
+		if has_batch and not d.get("batch_no"):
+			batch_list = get_batch_qty(item_code=d.item_code, warehouse=d.warehouse) or []
+			batch_list = [b for b in batch_list if flt(b.get("qty")) > 0]
+
+			if batch_list:
+				# FIFO: batches are already sorted by posting/expiry in ERPNext
+				d.batch_no = batch_list[0].get("batch_no")
+			else:
+				frappe.throw(_("No batches available in {0} for {1}.").format(d.warehouse, d.item_code))
 
 
 # ==========================================
@@ -543,121 +521,119 @@ def _auto_set_return_batches(invoice_doc):
 
 @frappe.whitelist()
 def validate_cart_items(items, pos_profile=None):
-    """Validate cart items for available stock.
+	"""Validate cart items for available stock.
 
-    Returns a list of item dicts where requested quantity exceeds availability.
-    This can be used on the front-end for pre-submission checks.
-    """
-    if isinstance(items, str):
-        items = json.loads(items)
+	Returns a list of item dicts where requested quantity exceeds availability.
+	This can be used on the front-end for pre-submission checks.
+	"""
+	if isinstance(items, str):
+		items = json.loads(items)
 
-    if pos_profile and not frappe.db.exists("POS Profile", pos_profile):
-        pos_profile = None
+	if pos_profile and not frappe.db.exists("POS Profile", pos_profile):
+		pos_profile = None
 
-    if not _should_block(pos_profile):
-        return []
+	if not _should_block(pos_profile):
+		return []
 
-    errors = _collect_stock_errors(items)
-    if not errors:
-        return []
+	errors = _collect_stock_errors(items)
+	if not errors:
+		return []
 
-    return errors
+	return errors
 
 
 @frappe.whitelist()
 def validate_return_items(original_invoice_name, return_items, doctype="Sales Invoice"):
-    """Ensure that return items do not exceed the quantity from the original invoice.
-    Also validates return time frame based on POS Settings.
-
-    Uses query builder for parameterized queries. Fetches invoice details, original
-    item quantities, and already-returned quantities in 3 queries total.
-    """
-    from frappe.utils import date_diff, getdate
-    from frappe.query_builder.functions import Sum, Abs
-
-    if isinstance(return_items, str):
-        return_items = json.loads(return_items)
-
-    # Fetch invoice pos_profile and posting_date for validation
-    si = frappe.qb.DocType(doctype)
-    invoice_data = (
-        frappe.qb.from_(si)
-        .select(si.pos_profile, si.posting_date)
-        .where(si.name == original_invoice_name)
-    ).run(as_dict=True)
-
-    if not invoice_data:
-        return {"valid": False, "message": _("Invoice {0} not found").format(original_invoice_name)}
-
-    invoice_info = invoice_data[0]
-
-    # Check return validity period from POS Settings
-    if invoice_info.pos_profile:
-        return_validity_days = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": invoice_info.pos_profile},
-                "return_validity_days"
-            ) or 0
-        )
-
-        if return_validity_days > 0:
-            days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
-            if days_since_invoice > return_validity_days:
-                return {
-                    "valid": False,
-                    "message": _(
-                        "Return period has expired. Invoice {0} was created {1} days ago. "
-                        "Returns are only allowed within {2} days of purchase."
-                    ).format(original_invoice_name, days_since_invoice, return_validity_days),
-                }
-
-    # Aggregate original item quantities by item_code
-    si_item = frappe.qb.DocType(f"{doctype} Item")
-    original_items = (
-        frappe.qb.from_(si_item)
-        .select(si_item.item_code, Sum(si_item.qty).as_("total_qty"))
-        .where(si_item.parent == original_invoice_name)
-        .groupby(si_item.item_code)
-    ).run(as_dict=True)
-
-    original_item_qty = {item.item_code: flt(item.total_qty) for item in original_items}
-
-    # Aggregate quantities already returned from previous return invoices
-    ret_si = frappe.qb.DocType(doctype)
-    ret_item = frappe.qb.DocType(f"{doctype} Item")
-
-    returned_qty_data = (
-        frappe.qb.from_(ret_si)
-        .inner_join(ret_item).on(ret_item.parent == ret_si.name)
-        .select(ret_item.item_code, Sum(Abs(ret_item.qty)).as_("returned_qty"))
-        .where(
-            (ret_si.return_against == original_invoice_name)
-            & (ret_si.docstatus == 1)
-            & (ret_si.is_return == 1)
-        )
-        .groupby(ret_item.item_code)
-    ).run(as_dict=True)
-
-    # Subtract returned quantities
-    for row in returned_qty_data:
-        if row.item_code in original_item_qty:
-            original_item_qty[row.item_code] -= flt(row.returned_qty)
-
-    # Validate new return items
-    for item in return_items:
-        item_code = item.get("item_code")
-        return_qty = abs(flt(item.get("qty", 0)))
-        remaining = original_item_qty.get(item_code, 0)
-        if return_qty > remaining:
-            return {
-                "valid": False,
-                "message": _(
-                    "You are trying to return more quantity for item {0} than was sold."
-                ).format(item_code),
-            }
-
-    return {"valid": True}
+	"""Ensure that return items do not exceed the quantity from the original invoice.
+	Also validates return time frame based on POS Settings.
+
+	Uses query builder for parameterized queries. Fetches invoice details, original
+	item quantities, and already-returned quantities in 3 queries total.
+	"""
+	from frappe.query_builder.functions import Abs, Sum
+	from frappe.utils import date_diff, getdate
+
+	if isinstance(return_items, str):
+		return_items = json.loads(return_items)
+
+	# Fetch invoice pos_profile and posting_date for validation
+	si = frappe.qb.DocType(doctype)
+	invoice_data = (
+		frappe.qb.from_(si).select(si.pos_profile, si.posting_date).where(si.name == original_invoice_name)
+	).run(as_dict=True)
+
+	if not invoice_data:
+		return {"valid": False, "message": _("Invoice {0} not found").format(original_invoice_name)}
+
+	invoice_info = invoice_data[0]
+
+	# Check return validity period from POS Settings
+	if invoice_info.pos_profile:
+		return_validity_days = cint(
+			frappe.db.get_value(
+				"POS Next Settings", {"pos_profile": invoice_info.pos_profile}, "return_validity_days"
+			)
+			or 0
+		)
+
+		if return_validity_days > 0:
+			days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
+			if days_since_invoice > return_validity_days:
+				return {
+					"valid": False,
+					"message": _(
+						"Return period has expired. Invoice {0} was created {1} days ago. "
+						"Returns are only allowed within {2} days of purchase."
+					).format(original_invoice_name, days_since_invoice, return_validity_days),
+				}
+
+	# Aggregate original item quantities by item_code
+	si_item = frappe.qb.DocType(f"{doctype} Item")
+	original_items = (
+		frappe.qb.from_(si_item)
+		.select(si_item.item_code, Sum(si_item.qty).as_("total_qty"))
+		.where(si_item.parent == original_invoice_name)
+		.groupby(si_item.item_code)
+	).run(as_dict=True)
+
+	original_item_qty = {item.item_code: flt(item.total_qty) for item in original_items}
+
+	# Aggregate quantities already returned from previous return invoices
+	ret_si = frappe.qb.DocType(doctype)
+	ret_item = frappe.qb.DocType(f"{doctype} Item")
+
+	returned_qty_data = (
+		frappe.qb.from_(ret_si)
+		.inner_join(ret_item)
+		.on(ret_item.parent == ret_si.name)
+		.select(ret_item.item_code, Sum(Abs(ret_item.qty)).as_("returned_qty"))
+		.where(
+			(ret_si.return_against == original_invoice_name)
+			& (ret_si.docstatus == 1)
+			& (ret_si.is_return == 1)
+		)
+		.groupby(ret_item.item_code)
+	).run(as_dict=True)
+
+	# Subtract returned quantities
+	for row in returned_qty_data:
+		if row.item_code in original_item_qty:
+			original_item_qty[row.item_code] -= flt(row.returned_qty)
+
+	# Validate new return items
+	for item in return_items:
+		item_code = item.get("item_code")
+		return_qty = abs(flt(item.get("qty", 0)))
+		remaining = original_item_qty.get(item_code, 0)
+		if return_qty > remaining:
+			return {
+				"valid": False,
+				"message": _("You are trying to return more quantity for item {0} than was sold.").format(
+					item_code
+				),
+			}
+
+	return {"valid": True}
 
 
 # ==========================================
@@ -667,837 +643,855 @@ def validate_return_items(original_invoice_name, return_items, doctype="Sales In
 
 @frappe.whitelist()
 def update_invoice(data):
-    """Create or update invoice draft (Step 1)."""
-    try:
-        data = json.loads(data) if isinstance(data, str) else data
-
-        pos_profile = data.get("pos_profile")
-        doctype = data.get("doctype", "Sales Invoice")
-
-        # Ensure the document type is set
-        data.setdefault("doctype", doctype)
-
-        # Normalize pricing_rules before document creation
-        standardize_pricing_rules(data.get("items"))
-
-        # Create or update invoice
-        if data.get("name"):
-            invoice_doc = frappe.get_doc(doctype, data.get("name"))
-            invoice_doc.update(data)
-        else:
-            invoice_doc = frappe.get_doc(data)
-
-        pos_profile_doc = None
-        if pos_profile:
-            try:
-                pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
-            except Exception:
-                frappe.throw(_("Unable to load POS Profile {0}").format(pos_profile))
-
-            invoice_doc.pos_profile = pos_profile
-
-            if pos_profile_doc:
-                if pos_profile_doc.company and not invoice_doc.get("company"):
-                    invoice_doc.company = pos_profile_doc.company
-                if pos_profile_doc.currency and not invoice_doc.get("currency"):
-                    invoice_doc.currency = pos_profile_doc.currency
-
-                # Copy accounting dimensions from POS Profile
-                if hasattr(pos_profile_doc, "branch") and pos_profile_doc.branch:
-                    invoice_doc.branch = pos_profile_doc.branch
-                    # Also set branch on all items for GL entries
-                    for item in invoice_doc.get("items", []):
-                        item.branch = pos_profile_doc.branch
-
-        company = invoice_doc.get("company") or (
-            pos_profile_doc.company if pos_profile_doc else None
-        )
-
-        if company and invoice_doc.get("payments") and doctype == "Sales Invoice":
-            _set_payment_accounts(invoice_doc.payments, company)
-
-        # Validate return items if this is a return invoice
-        if (data.get("is_return") or invoice_doc.get("is_return")) and invoice_doc.get(
-            "return_against"
-        ):
-            validation = validate_return_items(
-                invoice_doc.return_against,
-                [d.as_dict() for d in invoice_doc.items],
-                doctype=invoice_doc.doctype,
-            )
-            if not validation.get("valid"):
-                frappe.throw(validation.get("message"))
-
-        # Ensure customer exists
-        customer_name = invoice_doc.get("customer")
-        if customer_name and not frappe.db.exists("Customer", customer_name):
-            try:
-                cust = frappe.get_doc(
-                    {
-                        "doctype": "Customer",
-                        "customer_name": customer_name,
-                        "customer_group": "All Customer Groups",
-                        "territory": "All Territories",
-                        "customer_type": "Individual",
-                    }
-                )
-                cust.flags.ignore_permissions = True
-                cust.insert()
-                invoice_doc.customer = cust.name
-                invoice_doc.customer_name = cust.customer_name
-            except Exception as e:
-                frappe.log_error(f"Failed to create customer {customer_name}: {e}")
-
-        # Disable automatic pricing rules (we handle discounts manually from POS)
-        invoice_doc.ignore_pricing_rule = 1
-        invoice_doc.flags.ignore_pricing_rule = True
-
-        # ========================================================================
-        # OPTIMIZATION: Cache POS Settings to avoid repeated DB queries
-        # Fetch all needed settings in a single query at the start
-        # ========================================================================
-        pos_settings_cache = None
-        if pos_profile:
-            pos_settings_cache = frappe.db.get_value(
-                DOCTYPE_POS_SETTINGS,
-                {"pos_profile": pos_profile},
-                [
-                    FIELD_ALLOW_USER_TO_EDIT_RATE,
-                    FIELD_MAX_DISCOUNT_ALLOWED,
-                    FIELD_ALLOW_NEGATIVE_STOCK
-                ],
-                as_dict=True
-            )
-            # disable_rounded_total is on POS Profile, not POS Settings
-            pos_profile_rounded = frappe.db.get_value(
-                DOCTYPE_POS_PROFILE,
-                pos_profile,
-                FIELD_DISABLE_ROUNDED_TOTAL
-            )
-            if pos_settings_cache:
-                pos_settings_cache[FIELD_DISABLE_ROUNDED_TOTAL] = pos_profile_rounded
-            else:
-                pos_settings_cache = {FIELD_DISABLE_ROUNDED_TOTAL: pos_profile_rounded}
-
-        # ========================================================================
-        # DISCOUNT CALCULATION - CRITICAL LOGIC
-        # ========================================================================
-        # Frontend sends: rate (discounted), price_list_rate (original), discount_percentage
-        # Priority: Trust frontend's price_list_rate if provided (avoids rounding errors)
-        # Fallback: Reverse-calculate price_list_rate from rate and discount_percentage
-        #
-        # Formula: rate = price_list_rate * (1 - discount_percentage/100)
-        # Reverse: price_list_rate = rate / (1 - discount_percentage/100)
-        # ========================================================================
-        for item in invoice_doc.get("items", []):
-            item_rate = flt(item.rate or 0)
-            discount_pct = flt(item.discount_percentage or 0)
-            frontend_price_list_rate = flt(item.get("price_list_rate") or 0)
-            is_manual_edit = cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED) or 0)
-
-            if is_manual_edit:
-                # MANUAL RATE EDIT: preserve original price_list_rate for audit
-                original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
-                if original_rate > 0:
-                    item.price_list_rate = original_rate
-
-                # Validate manual rate edit against business rules (uses cached settings)
-                validation = validate_manual_rate_edit(item, pos_profile, pos_settings_cache)
-                if not validation.get("valid"):
-                    frappe.throw(validation.get("message"))
-            else:
-                # NORMAL FLOW: Trust frontend's price_list_rate if provided and valid
-                if frontend_price_list_rate > 0:
-                    item.price_list_rate = frontend_price_list_rate
-                # Fallback: reverse-calculate if discount exists but no price_list_rate
-                elif discount_pct > 0 and discount_pct < 100 and item_rate > 0:
-                    item.price_list_rate = calculate_price_list_rate(
-                        item_rate, discount_pct, frontend_price_list_rate
-                    )
-                else:
-                    # No discount or price_list_rate - use rate as is
-                    item.price_list_rate = item_rate
-
-                # Ensure price_list_rate is never less than rate (data integrity)
-                if flt(item.price_list_rate) < item_rate:
-                    item.price_list_rate = item_rate
-
-            # IMPORTANT: Keep the rate from frontend (do NOT set to 0)
-            # ERPNext will recalculate if needed, but preserving frontend rate
-            # prevents rounding issues and ensures UI matches invoice
-
-            # Convert pricing_rules from list to comma-separated string
-            # ERPNext expects pricing_rules as a string, not a list
-            pricing_rules = item.get("pricing_rules")
-            if pricing_rules:
-                if isinstance(pricing_rules, list):
-                    item.pricing_rules = ",".join(str(r) for r in pricing_rules)
-                elif isinstance(pricing_rules, str) and pricing_rules.startswith("["):
-                    # Handle JSON string representation of list
-                    try:
-                        rules_list = json.loads(pricing_rules)
-                        if isinstance(rules_list, list):
-                            item.pricing_rules = ",".join(str(r) for r in rules_list)
-                    except (json.JSONDecodeError, TypeError):
-                        # Keep original value - malformed JSON will be handled by standardize_pricing_rules
-                        item.pricing_rules = ""
-
-        # Set invoice flags BEFORE calculations
-        if doctype == "Sales Invoice":
-            invoice_doc.is_pos = 1
-            invoice_doc.update_stock = 1
-            if pos_profile_doc and pos_profile_doc.warehouse:
-                invoice_doc.set_warehouse = pos_profile_doc.warehouse
-
-        # ========================================================================
-        # ROUNDING CONFIGURATION
-        # ========================================================================
-        # Load rounding preference from POS Settings (use cached value)
-        # When disabled (0): ERPNext rounds to nearest whole number
-        # When enabled (1): Shows exact amount without rounding
-        # ========================================================================
-        disable_rounded = 1  # Default: disable rounding for POS (show exact amounts)
-
-        if pos_settings_cache and pos_settings_cache.get(FIELD_DISABLE_ROUNDED_TOTAL) is not None:
-            disable_rounded = cint(pos_settings_cache.get(FIELD_DISABLE_ROUNDED_TOTAL))
-
-        invoice_doc.disable_rounded_total = disable_rounded
-
-        # ========================================================================
-        # POPULATE MISSING FIELDS — using for_validate=True intentionally
-        # ========================================================================
-        # ERPNext's set_missing_values() calls set_pos_fields() internally.
-        #
-        # With for_validate=False (the default):
-        #   set_pos_fields() -> update_multi_mode_option() which does:
-        #     1. doc.set("payments", [])          — wipes ALL payment rows
-        #     2. Rebuilds payments from POS Profile template with amount=0
-        #   Result: frontend payment amounts are destroyed before the invoice
-        #   is saved, causing invoices to appear unpaid (outstanding = grand_total).
-        #
-        # With for_validate=True:
-        #   set_pos_fields() skips update_multi_mode_option() entirely,
-        #   and only fills in missing fields (debit_to, currency, write_off_account,
-        #   cost_center, etc.) without overwriting values already set.
-        #   Payment accounts are set separately via _set_payment_accounts() below.
-        #
-        # This is safe on all ERPNext versions because POS Next already sets
-        # the fields that for_validate=True skips:
-        #   - ignore_pricing_rule  → set above (line ~752)
-        #   - customer             → sent from frontend
-        #   - tax_category         → sent from frontend or not needed
-        # ========================================================================
-        invoice_doc.set_missing_values(for_validate=True)
-
-        # Calculate totals and apply discounts (with rounding disabled)
-        invoice_doc.calculate_taxes_and_totals()
-        if invoice_doc.grand_total is None:
-            invoice_doc.grand_total = 0.0
-        if invoice_doc.base_grand_total is None:
-            invoice_doc.base_grand_total = 0.0
-
-        # Set accounts for payment methods before saving
-        _set_payment_accounts(invoice_doc.payments, invoice_doc.company)
-
-        # For return invoices, ensure payments are negative
-        if invoice_doc.get("is_return"):
-            # Return handling is primarily for Sales Invoice
-            if doctype == "Sales Invoice" and invoice_doc.get("payments"):
-                for payment in invoice_doc.payments:
-                    payment.amount = -abs(payment.amount)
-                    if payment.base_amount:
-                        payment.base_amount = -abs(payment.base_amount)
-
-                invoice_doc.paid_amount = flt(sum(p.amount for p in invoice_doc.payments))
-                invoice_doc.base_paid_amount = flt(
-                    sum(p.base_amount or 0 for p in invoice_doc.payments)
-                )
-
-        # Validate and track POS Coupon if coupon_code is provided
-        coupon_code = data.get("coupon_code")
-        if coupon_code:
-            # Validate POS Coupon exists and is valid
-            if frappe.db.table_exists("POS Coupon"):
-                from pos_next.pos_next.doctype.pos_coupon.pos_coupon import check_coupon_code
-
-                coupon_result = check_coupon_code(
-                    coupon_code,
-                    customer=invoice_doc.customer,
-                    company=invoice_doc.company
-                )
-
-                if not coupon_result or not coupon_result.get("valid"):
-                    error_msg = coupon_result.get("msg", "Invalid coupon code") if coupon_result else "Invalid coupon code"
-                    frappe.throw(_(error_msg))
-
-                # Store coupon code on invoice for tracking
-                invoice_doc.coupon_code = coupon_code
-
-        # Validate stock availability before saving draft
-        # is_stock_item may not be set on unsaved doc items (frontend doesn't send it),
-        # so look it up from Item master
-        if not invoice_doc.get("is_return") and _should_block(pos_profile):
-            item_codes = list({d.item_code for d in invoice_doc.items if d.get("item_code")})
-            if item_codes:
-                stock_item_set = set(frappe.get_all(
-                    "Item",
-                    filters={"name": ["in", item_codes], "is_stock_item": 1},
-                    pluck="name"
-                ))
-                stock_items = [
-                    d.as_dict() for d in invoice_doc.items
-                    if d.get("item_code") in stock_item_set
-                ]
-                if stock_items:
-                    errors = _collect_stock_errors(stock_items)
-                    if errors:
-                        frappe.throw(frappe.as_json({"errors": errors}), frappe.ValidationError)
-
-        # Save as draft
-        invoice_doc.flags.ignore_permissions = True
-        frappe.flags.ignore_account_permission = True
-        invoice_doc.docstatus = 0
-        invoice_doc.save()
-
-        return invoice_doc.as_dict()
-    except Exception as e:
-        frappe.log_error(frappe.get_traceback(), "Update Invoice Error")
-        raise
+	"""Create or update invoice draft (Step 1)."""
+	try:
+		data = json.loads(data) if isinstance(data, str) else data
+
+		pos_profile = data.get("pos_profile")
+		doctype = data.get("doctype", "Sales Invoice")
+
+		# Ensure the document type is set
+		data.setdefault("doctype", doctype)
+
+		# Normalize pricing_rules before document creation
+		standardize_pricing_rules(data.get("items"))
+
+		# Create or update invoice
+		if data.get("name"):
+			invoice_doc = frappe.get_doc(doctype, data.get("name"))
+			invoice_doc.update(data)
+		else:
+			invoice_doc = frappe.get_doc(data)
+
+		pos_profile_doc = None
+		if pos_profile:
+			try:
+				pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
+			except Exception:
+				frappe.throw(_("Unable to load POS Profile {0}").format(pos_profile))
+
+			invoice_doc.pos_profile = pos_profile
+
+			if pos_profile_doc:
+				if pos_profile_doc.company and not invoice_doc.get("company"):
+					invoice_doc.company = pos_profile_doc.company
+				if pos_profile_doc.currency and not invoice_doc.get("currency"):
+					invoice_doc.currency = pos_profile_doc.currency
+
+				# Copy accounting dimensions from POS Profile
+				if hasattr(pos_profile_doc, "branch") and pos_profile_doc.branch:
+					invoice_doc.branch = pos_profile_doc.branch
+					# Also set branch on all items for GL entries
+					for item in invoice_doc.get("items", []):
+						item.branch = pos_profile_doc.branch
+
+		company = invoice_doc.get("company") or (pos_profile_doc.company if pos_profile_doc else None)
+
+		if company and invoice_doc.get("payments") and doctype == "Sales Invoice":
+			_set_payment_accounts(invoice_doc.payments, company)
+
+		# Validate return items if this is a return invoice
+		if (data.get("is_return") or invoice_doc.get("is_return")) and invoice_doc.get("return_against"):
+			validation = validate_return_items(
+				invoice_doc.return_against,
+				[d.as_dict() for d in invoice_doc.items],
+				doctype=invoice_doc.doctype,
+			)
+			if not validation.get("valid"):
+				frappe.throw(validation.get("message"))
+
+		# Ensure customer exists
+		customer_name = invoice_doc.get("customer")
+		if customer_name and not frappe.db.exists("Customer", customer_name):
+			try:
+				cust = frappe.get_doc(
+					{
+						"doctype": "Customer",
+						"customer_name": customer_name,
+						"customer_group": "All Customer Groups",
+						"territory": "All Territories",
+						"customer_type": "Individual",
+					}
+				)
+				cust.flags.ignore_permissions = True
+				cust.insert()
+				invoice_doc.customer = cust.name
+				invoice_doc.customer_name = cust.customer_name
+			except Exception as e:
+				frappe.log_error(f"Failed to create customer {customer_name}: {e}")
+
+		# Disable automatic pricing rules (we handle discounts manually from POS)
+		invoice_doc.ignore_pricing_rule = 1
+		invoice_doc.flags.ignore_pricing_rule = True
+
+		# ========================================================================
+		# OPTIMIZATION: Cache POS Settings to avoid repeated DB queries
+		# Fetch all needed settings in a single query at the start
+		# ========================================================================
+		pos_settings_cache = None
+		if pos_profile:
+			pos_settings_cache = frappe.db.get_value(
+				DOCTYPE_POS_SETTINGS,
+				{"pos_profile": pos_profile},
+				[FIELD_ALLOW_USER_TO_EDIT_RATE, FIELD_MAX_DISCOUNT_ALLOWED, FIELD_ALLOW_NEGATIVE_STOCK],
+				as_dict=True,
+			)
+			# disable_rounded_total is on POS Profile, not POS Settings
+			pos_profile_rounded = frappe.db.get_value(
+				DOCTYPE_POS_PROFILE, pos_profile, FIELD_DISABLE_ROUNDED_TOTAL
+			)
+			if pos_settings_cache:
+				pos_settings_cache[FIELD_DISABLE_ROUNDED_TOTAL] = pos_profile_rounded
+			else:
+				pos_settings_cache = {FIELD_DISABLE_ROUNDED_TOTAL: pos_profile_rounded}
+
+		# ========================================================================
+		# DISCOUNT CALCULATION - CRITICAL LOGIC
+		# ========================================================================
+		# Frontend sends: rate (discounted), price_list_rate (original), discount_percentage
+		# Priority: Trust frontend's price_list_rate if provided (avoids rounding errors)
+		# Fallback: Reverse-calculate price_list_rate from rate and discount_percentage
+		#
+		# Formula: rate = price_list_rate * (1 - discount_percentage/100)
+		# Reverse: price_list_rate = rate / (1 - discount_percentage/100)
+		# ========================================================================
+		for item in invoice_doc.get("items", []):
+			item_rate = flt(item.rate or 0)
+			discount_pct = flt(item.discount_percentage or 0)
+			frontend_price_list_rate = flt(item.get("price_list_rate") or 0)
+			is_manual_edit = cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED) or 0)
+
+			if is_manual_edit:
+				# MANUAL RATE EDIT: preserve original price_list_rate for audit
+				original_rate = flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE) or 0)
+				if original_rate > 0:
+					item.price_list_rate = original_rate
+
+				# Validate manual rate edit against business rules (uses cached settings)
+				validation = validate_manual_rate_edit(item, pos_profile, pos_settings_cache)
+				if not validation.get("valid"):
+					frappe.throw(validation.get("message"))
+			else:
+				# NORMAL FLOW: Trust frontend's price_list_rate if provided and valid
+				if frontend_price_list_rate > 0:
+					item.price_list_rate = frontend_price_list_rate
+				# Fallback: reverse-calculate if discount exists but no price_list_rate
+				elif discount_pct > 0 and discount_pct < 100 and item_rate > 0:
+					item.price_list_rate = calculate_price_list_rate(
+						item_rate, discount_pct, frontend_price_list_rate
+					)
+				else:
+					# No discount or price_list_rate - use rate as is
+					item.price_list_rate = item_rate
+
+				# Ensure price_list_rate is never less than rate (data integrity)
+				if flt(item.price_list_rate) < item_rate:
+					item.price_list_rate = item_rate
+
+			# IMPORTANT: Keep the rate from frontend (do NOT set to 0)
+			# ERPNext will recalculate if needed, but preserving frontend rate
+			# prevents rounding issues and ensures UI matches invoice
+
+			# Convert pricing_rules from list to comma-separated string
+			# ERPNext expects pricing_rules as a string, not a list
+			pricing_rules = item.get("pricing_rules")
+			if pricing_rules:
+				if isinstance(pricing_rules, list):
+					item.pricing_rules = ",".join(str(r) for r in pricing_rules)
+				elif isinstance(pricing_rules, str) and pricing_rules.startswith("["):
+					# Handle JSON string representation of list
+					try:
+						rules_list = json.loads(pricing_rules)
+						if isinstance(rules_list, list):
+							item.pricing_rules = ",".join(str(r) for r in rules_list)
+					except (json.JSONDecodeError, TypeError):
+						# Keep original value - malformed JSON will be handled by standardize_pricing_rules
+						item.pricing_rules = ""
+
+		# Set invoice flags BEFORE calculations
+		if doctype == "Sales Invoice":
+			invoice_doc.is_pos = 1
+			invoice_doc.update_stock = 1
+			if pos_profile_doc and pos_profile_doc.warehouse:
+				invoice_doc.set_warehouse = pos_profile_doc.warehouse
+
+		# ========================================================================
+		# ROUNDING CONFIGURATION
+		# ========================================================================
+		# Load rounding preference from POS Settings (use cached value)
+		# When disabled (0): ERPNext rounds to nearest whole number
+		# When enabled (1): Shows exact amount without rounding
+		# ========================================================================
+		disable_rounded = 1  # Default: disable rounding for POS (show exact amounts)
+
+		if pos_settings_cache and pos_settings_cache.get(FIELD_DISABLE_ROUNDED_TOTAL) is not None:
+			disable_rounded = cint(pos_settings_cache.get(FIELD_DISABLE_ROUNDED_TOTAL))
+
+		invoice_doc.disable_rounded_total = disable_rounded
+
+		# ========================================================================
+		# POPULATE MISSING FIELDS — using for_validate=True intentionally
+		# ========================================================================
+		# ERPNext's set_missing_values() calls set_pos_fields() internally.
+		#
+		# With for_validate=False (the default):
+		#   set_pos_fields() -> update_multi_mode_option() which does:
+		#     1. doc.set("payments", [])          — wipes ALL payment rows
+		#     2. Rebuilds payments from POS Profile template with amount=0
+		#   Result: frontend payment amounts are destroyed before the invoice
+		#   is saved, causing invoices to appear unpaid (outstanding = grand_total).
+		#
+		# With for_validate=True:
+		#   set_pos_fields() skips update_multi_mode_option() entirely,
+		#   and only fills in missing fields (debit_to, currency, write_off_account,
+		#   cost_center, etc.) without overwriting values already set.
+		#   Payment accounts are set separately via _set_payment_accounts() below.
+		#
+		# This is safe on all ERPNext versions because POS Next already sets
+		# the fields that for_validate=True skips:
+		#   - ignore_pricing_rule  → set above (line ~752)
+		#   - customer             → sent from frontend
+		#   - tax_category         → sent from frontend or not needed
+		# ========================================================================
+		invoice_doc.set_missing_values(for_validate=True)
+
+		# Calculate totals and apply discounts (with rounding disabled)
+		invoice_doc.calculate_taxes_and_totals()
+		if invoice_doc.grand_total is None:
+			invoice_doc.grand_total = 0.0
+		if invoice_doc.base_grand_total is None:
+			invoice_doc.base_grand_total = 0.0
+
+		# Set accounts for payment methods before saving
+		_set_payment_accounts(invoice_doc.payments, invoice_doc.company)
+
+		# Calculate paid_amount and base_paid_amount from payment rows
+		# This applies to both regular and return invoices (required before submission)
+		if doctype == "Sales Invoice" and invoice_doc.get("payments"):
+			# For return invoices, ensure payments are negative
+			if invoice_doc.get("is_return"):
+				for payment in invoice_doc.payments:
+					payment.amount = -abs(payment.amount)
+					if payment.base_amount:
+						payment.base_amount = -abs(payment.base_amount)
+
+			# Calculate total paid amount from all payment rows
+			# This ensures the invoice is not marked as "Pay on Account" when payments exist
+			invoice_doc.paid_amount = flt(sum(p.amount for p in invoice_doc.payments))
+			invoice_doc.base_paid_amount = flt(sum(p.base_amount or 0 for p in invoice_doc.payments))
+
+		# Validate and track POS Coupon if coupon_code is provided
+		coupon_code = data.get("coupon_code")
+		if coupon_code:
+			# Validate POS Coupon exists and is valid
+			if frappe.db.table_exists("POS Coupon"):
+				from pos_next.pos_next.doctype.pos_coupon.pos_coupon import check_coupon_code
+
+				coupon_result = check_coupon_code(
+					coupon_code, customer=invoice_doc.customer, company=invoice_doc.company
+				)
+
+				if not coupon_result or not coupon_result.get("valid"):
+					error_msg = (
+						coupon_result.get("msg", "Invalid coupon code")
+						if coupon_result
+						else "Invalid coupon code"
+					)
+					frappe.throw(_(error_msg))
+
+				# Store coupon code on invoice for tracking
+				invoice_doc.coupon_code = coupon_code
+
+		# Validate stock availability before saving draft
+		# is_stock_item may not be set on unsaved doc items (frontend doesn't send it),
+		# so look it up from Item master
+		if not invoice_doc.get("is_return") and _should_block(pos_profile):
+			item_codes = list({d.item_code for d in invoice_doc.items if d.get("item_code")})
+			if item_codes:
+				stock_item_set = set(
+					frappe.get_all(
+						"Item", filters={"name": ["in", item_codes], "is_stock_item": 1}, pluck="name"
+					)
+				)
+				stock_items = [d.as_dict() for d in invoice_doc.items if d.get("item_code") in stock_item_set]
+				if stock_items:
+					errors = _collect_stock_errors(stock_items)
+					if errors:
+						frappe.throw(frappe.as_json({"errors": errors}), frappe.ValidationError)
+
+		# Save as draft
+		invoice_doc.flags.ignore_permissions = True
+		frappe.flags.ignore_account_permission = True
+		invoice_doc.docstatus = 0
+		invoice_doc.save()
+
+		return invoice_doc.as_dict()
+	except Exception:
+		frappe.log_error(frappe.get_traceback(), "Update Invoice Error")
+		raise
 
 
 PENDING_TIMEOUT_MINUTES = 5  # Pending records older than this are considered stale
 
 
 def _is_pending_expired(modified_time):
-    """Check if a pending record has expired based on modified time."""
-    if not modified_time:
-        return True  # No timestamp means treat as expired
-    age_minutes = (frappe.utils.now_datetime() - modified_time).total_seconds() / 60
-    return age_minutes > PENDING_TIMEOUT_MINUTES
+	"""Check if a pending record has expired based on modified time."""
+	if not modified_time:
+		return True  # No timestamp means treat as expired
+	age_minutes = (frappe.utils.now_datetime() - modified_time).total_seconds() / 60
+	return age_minutes > PENDING_TIMEOUT_MINUTES
 
 
 def _reuse_sync_record(sync_record_name):
-    """Reset an existing sync record to Pending status for retry."""
-    sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
-    sync_doc.status = "Pending"
-    sync_doc.synced_at = None
-    sync_doc.flags.ignore_permissions = True
-    sync_doc.save()
-    return {"already_synced": False, "sync_record_name": sync_record_name}
+	"""Reset an existing sync record to Pending status for retry."""
+	sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
+	sync_doc.status = "Pending"
+	sync_doc.synced_at = None
+	sync_doc.flags.ignore_permissions = True
+	sync_doc.save()
+	return {"already_synced": False, "sync_record_name": sync_record_name}
 
 
 def _ensure_offline_uniqueness(offline_id, pos_profile=None, customer=None):
-    """
-    Ensure offline invoice uniqueness with race condition protection.
-
-    Uses a reservation pattern:
-    1. Check if a sync record exists (with row-level lock)
-    2. If synced with valid invoice, return existing invoice
-    3. If synced but invoice deleted/invalid, allow retry
-    4. If pending but expired (>5 min), allow retry
-    5. If pending and active, reject (another request processing)
-    6. If failed, allow retry
-    7. If not exists, create pending reservation
-
-    Args:
-        offline_id: The unique offline ID from the client
-        pos_profile: POS Profile name
-        customer: Customer name
-
-    Returns:
-        dict with:
-        - already_synced (bool): True if invoice was already synced
-        - invoice_data (dict): Existing invoice data if already_synced
-        - sync_record_name (str): Name of the sync record for this attempt
-    """
-    # Acquire row-level lock to prevent race conditions
-    existing_sync = frappe.db.get_value(
-        "Offline Invoice Sync",
-        {"offline_id": offline_id},
-        ["name", "sales_invoice", "status", "modified"],
-        as_dict=True,
-        for_update=True
-    )
-
-    if existing_sync:
-        sync_status = existing_sync.get("status")
-        sync_record_name = existing_sync.name
-
-        # Handle Pending status
-        if sync_status == "Pending":
-            if _is_pending_expired(existing_sync.get("modified")):
-                # Expired pending - allow retry
-                return _reuse_sync_record(sync_record_name)
-            else:
-                # Active pending - reject with specific error code
-                frappe.throw(
-                    _("This invoice is currently being processed. Please wait."),
-                    exc=frappe.ValidationError,
-                    title="SYNC_IN_PROGRESS"
-                )
-
-        # Handle Failed status - allow retry
-        if sync_status == "Failed":
-            return _reuse_sync_record(sync_record_name)
-
-        # Handle Synced status - verify invoice still valid
-        if sync_status == "Synced" and existing_sync.sales_invoice:
-            if frappe.db.exists("Sales Invoice", existing_sync.sales_invoice):
-                existing_invoice = frappe.get_doc("Sales Invoice", existing_sync.sales_invoice)
-                if existing_invoice.docstatus == 1:
-                    return {
-                        "already_synced": True,
-                        "invoice_data": {
-                            "name": existing_invoice.name,
-                            "status": existing_invoice.docstatus,
-                            "grand_total": existing_invoice.grand_total,
-                            "total": existing_invoice.total,
-                            "net_total": existing_invoice.net_total,
-                            "outstanding_amount": getattr(existing_invoice, "outstanding_amount", 0),
-                            "paid_amount": getattr(existing_invoice, "paid_amount", 0),
-                            "change_amount": getattr(existing_invoice, "change_amount", 0),
-                            "duplicate_prevented": True,
-                            "offline_id": offline_id,
-                        }
-                    }
-
-            # Synced record points to deleted/invalid invoice - allow retry
-            return _reuse_sync_record(sync_record_name)
-
-        # Unknown status or synced without invoice - allow retry
-        return _reuse_sync_record(sync_record_name)
-
-    # No existing record - create pending reservation
-    try:
-        pending_sync = frappe.get_doc({
-            "doctype": "Offline Invoice Sync",
-            "offline_id": offline_id,
-            "sales_invoice": "",
-            "pos_profile": pos_profile,
-            "customer": customer,
-            "status": "Pending",
-        })
-        pending_sync.flags.ignore_permissions = True
-        pending_sync.insert()
-
-        return {
-            "already_synced": False,
-            "sync_record_name": pending_sync.name
-        }
-    except frappe.DuplicateEntryError:
-        # Race condition: another request just created the record
-        # Retry the check to get the new record
-        return _ensure_offline_uniqueness(offline_id, pos_profile, customer)
+	"""
+	Ensure offline invoice uniqueness with race condition protection.
+
+	Uses a reservation pattern:
+	1. Check if a sync record exists (with row-level lock)
+	2. If synced with valid invoice, return existing invoice
+	3. If synced but invoice deleted/invalid, allow retry
+	4. If pending but expired (>5 min), allow retry
+	5. If pending and active, reject (another request processing)
+	6. If failed, allow retry
+	7. If not exists, create pending reservation
+
+	Args:
+	    offline_id: The unique offline ID from the client
+	    pos_profile: POS Profile name
+	    customer: Customer name
+
+	Returns:
+	    dict with:
+	    - already_synced (bool): True if invoice was already synced
+	    - invoice_data (dict): Existing invoice data if already_synced
+	    - sync_record_name (str): Name of the sync record for this attempt
+	"""
+	# Acquire row-level lock to prevent race conditions
+	existing_sync = frappe.db.get_value(
+		"Offline Invoice Sync",
+		{"offline_id": offline_id},
+		["name", "sales_invoice", "status", "modified"],
+		as_dict=True,
+		for_update=True,
+	)
+
+	if existing_sync:
+		sync_status = existing_sync.get("status")
+		sync_record_name = existing_sync.name
+
+		# Handle Pending status
+		if sync_status == "Pending":
+			if _is_pending_expired(existing_sync.get("modified")):
+				# Expired pending - allow retry
+				return _reuse_sync_record(sync_record_name)
+			else:
+				# Active pending - reject with specific error code
+				frappe.throw(
+					_("This invoice is currently being processed. Please wait."),
+					exc=frappe.ValidationError,
+					title="SYNC_IN_PROGRESS",
+				)
+
+		# Handle Failed status - allow retry
+		if sync_status == "Failed":
+			return _reuse_sync_record(sync_record_name)
+
+		# Handle Synced status - verify invoice still valid
+		if sync_status == "Synced" and existing_sync.sales_invoice:
+			if frappe.db.exists("Sales Invoice", existing_sync.sales_invoice):
+				existing_invoice = frappe.get_doc("Sales Invoice", existing_sync.sales_invoice)
+				if existing_invoice.docstatus == 1:
+					return {
+						"already_synced": True,
+						"invoice_data": {
+							"name": existing_invoice.name,
+							"status": existing_invoice.docstatus,
+							"grand_total": existing_invoice.grand_total,
+							"total": existing_invoice.total,
+							"net_total": existing_invoice.net_total,
+							"outstanding_amount": getattr(existing_invoice, "outstanding_amount", 0),
+							"paid_amount": getattr(existing_invoice, "paid_amount", 0),
+							"change_amount": getattr(existing_invoice, "change_amount", 0),
+							"duplicate_prevented": True,
+							"offline_id": offline_id,
+						},
+					}
+
+			# Synced record points to deleted/invalid invoice - allow retry
+			return _reuse_sync_record(sync_record_name)
+
+		# Unknown status or synced without invoice - allow retry
+		return _reuse_sync_record(sync_record_name)
+
+	# No existing record - create pending reservation
+	try:
+		pending_sync = frappe.get_doc(
+			{
+				"doctype": "Offline Invoice Sync",
+				"offline_id": offline_id,
+				"sales_invoice": "",
+				"pos_profile": pos_profile,
+				"customer": customer,
+				"status": "Pending",
+			}
+		)
+		pending_sync.flags.ignore_permissions = True
+		pending_sync.insert()
+
+		return {"already_synced": False, "sync_record_name": pending_sync.name}
+	except frappe.DuplicateEntryError:
+		# Race condition: another request just created the record
+		# Retry the check to get the new record
+		return _ensure_offline_uniqueness(offline_id, pos_profile, customer)
 
 
 def _complete_offline_sync(sync_record_name, invoice_name):
-    """
-    Mark an offline sync record as completed after successful invoice submission.
-
-    Args:
-        sync_record_name: Name of the Offline Invoice Sync record
-        invoice_name: Name of the submitted Sales Invoice
-    """
-    if not sync_record_name:
-        return
-
-    try:
-        sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
-        sync_doc.sales_invoice = invoice_name
-        sync_doc.status = "Synced"
-        sync_doc.synced_at = frappe.utils.now_datetime()
-        sync_doc.flags.ignore_permissions = True
-        sync_doc.save()
-    except Exception as error:
-        frappe.log_error(
-            title="Offline Sync Completion Error",
-            message=f"Failed to complete sync record {sync_record_name} for invoice {invoice_name}: {str(error)}"
-        )
+	"""
+	Mark an offline sync record as completed after successful invoice submission.
+
+	Args:
+	    sync_record_name: Name of the Offline Invoice Sync record
+	    invoice_name: Name of the submitted Sales Invoice
+	"""
+	if not sync_record_name:
+		return
+
+	try:
+		sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
+		sync_doc.sales_invoice = invoice_name
+		sync_doc.status = "Synced"
+		sync_doc.synced_at = frappe.utils.now_datetime()
+		sync_doc.flags.ignore_permissions = True
+		sync_doc.save()
+	except Exception as error:
+		frappe.log_error(
+			title="Offline Sync Completion Error",
+			message=f"Failed to complete sync record {sync_record_name} for invoice {invoice_name}: {error!s}",
+		)
 
 
 def _cleanup_failed_sync(sync_record_name):
-    """
-    Mark a sync record as failed when invoice submission fails.
-
-    Instead of deleting, we mark as 'failed' to:
-    1. Preserve audit trail of sync attempts
-    2. Allow manual investigation of failures
-    3. Enable retry logic based on failure count
-
-    Args:
-        sync_record_name: Name of the Offline Invoice Sync record
-    """
-    if not sync_record_name:
-        return
-
-    try:
-        sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
-        sync_doc.status = "Failed"
-        sync_doc.synced_at = frappe.utils.now_datetime()
-        sync_doc.flags.ignore_permissions = True
-        sync_doc.save()
-    except Exception as error:
-        frappe.log_error(
-            title="Offline Sync Cleanup Error",
-            message=f"Failed to mark sync record {sync_record_name} as failed: {str(error)}"
-        )
+	"""
+	Mark a sync record as failed when invoice submission fails.
+
+	Instead of deleting, we mark as 'failed' to:
+	1. Preserve audit trail of sync attempts
+	2. Allow manual investigation of failures
+	3. Enable retry logic based on failure count
+
+	Args:
+	    sync_record_name: Name of the Offline Invoice Sync record
+	"""
+	if not sync_record_name:
+		return
+
+	try:
+		sync_doc = frappe.get_doc("Offline Invoice Sync", sync_record_name)
+		sync_doc.status = "Failed"
+		sync_doc.synced_at = frappe.utils.now_datetime()
+		sync_doc.flags.ignore_permissions = True
+		sync_doc.save()
+	except Exception as error:
+		frappe.log_error(
+			title="Offline Sync Cleanup Error",
+			message=f"Failed to mark sync record {sync_record_name} as failed: {error!s}",
+		)
 
 
 @frappe.whitelist()
 def check_offline_invoice_synced(offline_id):
-    """
-    Check if an offline invoice has already been synced.
+	"""
+	Check if an offline invoice has already been synced.
 
-    This endpoint is called by the frontend before attempting to sync
-    an offline invoice, preventing duplicate submissions.
+	This endpoint is called by the frontend before attempting to sync
+	an offline invoice, preventing duplicate submissions.
 
-    Args:
-        offline_id: The unique offline ID to check
+	Args:
+	    offline_id: The unique offline ID to check
 
-    Returns:
-        dict with 'synced' (bool) and 'sales_invoice' (str or None)
-    """
-    from pos_next.pos_next.doctype.offline_invoice_sync.offline_invoice_sync import (
-        OfflineInvoiceSync,
-    )
+	Returns:
+	    dict with 'synced' (bool) and 'sales_invoice' (str or None)
+	"""
+	from pos_next.pos_next.doctype.offline_invoice_sync.offline_invoice_sync import (
+		OfflineInvoiceSync,
+	)
 
-    result = OfflineInvoiceSync.is_synced(offline_id)
+	result = OfflineInvoiceSync.is_synced(offline_id)
 
-    # Defensive check - ensure result is a dict
-    if not result or not isinstance(result, dict):
-        return {"synced": False, "sales_invoice": None}
+	# Defensive check - ensure result is a dict
+	if not result or not isinstance(result, dict):
+		return {"synced": False, "sales_invoice": None}
 
-    # Additionally verify the sales invoice still exists and is submitted
-    if result.get("synced") and result.get("sales_invoice"):
-        if frappe.db.exists("Sales Invoice", result["sales_invoice"]):
-            docstatus = frappe.db.get_value(
-                "Sales Invoice", result["sales_invoice"], "docstatus"
-            )
-            if docstatus == 1:  # Submitted
-                return result
+	# Additionally verify the sales invoice still exists and is submitted
+	if result.get("synced") and result.get("sales_invoice"):
+		if frappe.db.exists("Sales Invoice", result["sales_invoice"]):
+			docstatus = frappe.db.get_value("Sales Invoice", result["sales_invoice"], "docstatus")
+			if docstatus == 1:  # Submitted
+				return result
 
-        # Invoice was deleted or not submitted, clear the sync record
-        return {"synced": False, "sales_invoice": None}
+		# Invoice was deleted or not submitted, clear the sync record
+		return {"synced": False, "sales_invoice": None}
 
-    return result
+	return result
 
 
 @frappe.whitelist()
 def submit_invoice(invoice=None, data=None):
-    """Submit the invoice (Step 2)."""
-    # Handle different calling conventions
-    if invoice is None:
-        if data:
-            # Check if data is a JSON string containing both params
-            data_parsed = json.loads(data) if isinstance(data, str) else data
-
-            # frappe-ui might send all params nested in data
-            if isinstance(data_parsed, dict):
-                if "invoice" in data_parsed:
-                    invoice = data_parsed.get("invoice")
-                    data = data_parsed.get("data", {})
-                elif "name" in data_parsed or "doctype" in data_parsed:
-                    # Data itself might be the invoice
-                    invoice = data_parsed
-                    data = {}
-                else:
-                    frappe.throw(
-                        _("Missing invoice parameter. Received data: {0}").format(
-                            json.dumps(data_parsed, default=str)
-                        )
-                    )
-            else:
-                frappe.throw(_("Missing invoice parameter"))
-        else:
-            frappe.throw(_("Both invoice and data parameters are missing"))
-
-    # Parse JSON strings if needed
-    if isinstance(data, str):
-        data = json.loads(data) if data and data != "{}" else {}
-    if isinstance(invoice, str):
-        invoice = json.loads(invoice)
-
-    # Ensure invoice and data are dicts
-    if not isinstance(invoice, dict):
-        frappe.throw(_("Invalid invoice format"))
-        return  # Never reached, but helps type checker
-    if not isinstance(data, dict):
-        data = {}
-
-    pos_profile = invoice.get("pos_profile")
-    doctype = invoice.get("doctype", "Sales Invoice")
-
-    # Normalize pricing_rules before processing
-    standardize_pricing_rules(invoice.get("items"))
-
-    # ========================================================================
-    # OFFLINE INVOICE DEDUPLICATION
-    # ========================================================================
-    # Prevents duplicate invoice creation when the same offline invoice is
-    # submitted multiple times (e.g., network retry, multiple tabs).
-    # Uses a reservation pattern: create a "pending" record first, then
-    # update to "synced" after successful submission.
-    # ========================================================================
-    offline_id = invoice.get("offline_id") or data.get("offline_id")
-    sync_record_name = None
-
-    if offline_id:
-        dedup_result = _ensure_offline_uniqueness(
-            offline_id=offline_id,
-            pos_profile=pos_profile,
-            customer=invoice.get("customer")
-        )
-
-        if dedup_result and dedup_result.get("already_synced"):
-            # Invoice was already synced - return the existing invoice details
-            return dedup_result.get("invoice_data", {})
-
-        # Store the sync record name for later update
-        sync_record_name = dedup_result.get("sync_record_name") if dedup_result else None
-
-    # Track whether invoice was successfully submitted
-    invoice_submitted = False
-
-    try:
-        invoice_name = invoice.get("name")
-
-        # Get or create invoice
-        if not invoice_name or not frappe.db.exists(doctype, invoice_name):
-            created = update_invoice(json.dumps(invoice))
-            if not created or not isinstance(created, dict):
-                frappe.throw(_("Failed to create invoice draft"))
-            invoice_name = created.get("name")
-            if not invoice_name:
-                frappe.throw(_("Failed to get invoice name from draft"))
-            invoice_doc = frappe.get_doc(doctype, invoice_name)
-        else:
-            invoice_doc = frappe.get_doc(doctype, invoice_name)
-            invoice_doc.update(invoice)
-
-        # Ensure update_stock is set for Sales Invoice
-        if doctype == "Sales Invoice":
-            invoice_doc.update_stock = 1
-
-        # For return invoices, set update_outstanding_for_self = 0
-        # This ensures the GL entry's against_voucher points to the original invoice,
-        # which properly reduces the original invoice's outstanding amount and
-        # sets its status to "Credit Note Issued"
-        if invoice_doc.get("is_return") and invoice_doc.get("return_against"):
-            invoice_doc.update_outstanding_for_self = 0
-
-        # Copy accounting dimensions from POS Profile if not already set
-        if pos_profile and not invoice_doc.get("branch"):
-            try:
-                pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
-                if hasattr(pos_profile_doc, "branch") and pos_profile_doc.branch:
-                    invoice_doc.branch = pos_profile_doc.branch
-                    # Also set branch on all items for GL entries
-                    for item in invoice_doc.get("items", []):
-                        if not item.get("branch"):
-                            item.branch = pos_profile_doc.branch
-            except Exception as e:
-                # Branch is optional, log and continue
-                frappe.log_error(
-                    f"Failed to set branch from POS Profile {pos_profile}: {e}",
-                    "POS Profile Branch"
-                )
-
-        # Set accounts for all payment methods before saving
-        if doctype == "Sales Invoice" and hasattr(invoice_doc, "payments"):
-            _set_payment_accounts(invoice_doc.payments, invoice_doc.company)
-
-        # Handle sales team (multiple sales persons)
-        sales_team_data = invoice.get("sales_team") or data.get("sales_team")
-        if sales_team_data and isinstance(sales_team_data, list):
-            # Clear existing sales team entries
-            invoice_doc.sales_team = []
-
-            # Add new sales team entries
-            for member in sales_team_data:
-                if member and isinstance(member, dict):
-                    invoice_doc.append("sales_team", {
-                        "sales_person": member.get("sales_person"),
-                        "allocated_percentage": member.get("allocated_percentage", 0),
-                    })
-
-        # Handle POS Coupon if coupon_code is provided
-        coupon_code = invoice.get("coupon_code") or data.get("coupon_code")
-        if coupon_code:
-            # Increment usage counter for POS Coupon
-            if frappe.db.table_exists("POS Coupon"):
-                try:
-                    from pos_next.pos_next.doctype.pos_coupon.pos_coupon import increment_coupon_usage
-                    increment_coupon_usage(coupon_code)
-                except Exception as e:
-                    frappe.log_error(
-                        title="Failed to increment coupon usage",
-                        message=f"Coupon: {coupon_code}, Error: {str(e)}"
-                    )
-
-        # Auto-set batch numbers for returns
-        _auto_set_return_batches(invoice_doc)
-
-        # Handle write-off amount if provided
-        write_off_amount = flt(data.get("write_off_amount") or invoice.get("write_off_amount") or 0)
-        if write_off_amount > 0 and doctype == "Sales Invoice":
-            # Get write-off account and cost center from POS Profile
-            if pos_profile:
-                try:
-                    pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
-                    write_off_account = pos_profile_doc.write_off_account
-                    write_off_cost_center = pos_profile_doc.write_off_cost_center
-                    write_off_limit = flt(pos_profile_doc.write_off_limit or 0)
-
-                    # Validate write-off amount is within limit
-                    if write_off_limit > 0 and write_off_amount > write_off_limit:
-                        frappe.throw(
-                            _("Write-off amount {0} exceeds limit {1}").format(
-                                write_off_amount, write_off_limit
-                            )
-                        )
-
-                    # Set write-off fields on invoice
-                    if write_off_account:
-                        invoice_doc.write_off_account = write_off_account
-                        invoice_doc.write_off_cost_center = write_off_cost_center
-                        invoice_doc.write_off_amount = write_off_amount
-                        invoice_doc.base_write_off_amount = write_off_amount  # Assuming same currency
-                except Exception as e:
-                    frappe.log_error(
-                        f"Failed to apply write-off from POS Profile {pos_profile}: {e}",
-                        "POS Write-Off Error"
-                    )
-
-        # Validate stock availability before submission
-        # _validate_stock_on_invoice checks _should_block internally
-        # (global Stock Settings, POS Settings, and POS Profile flags)
-        _validate_stock_on_invoice(invoice_doc)
-
-        # Allow pure customer-credit POS sales to submit without a payment row.
-        customer_credit_dict = data.get("customer_credit_dict") or invoice.get("customer_credit_dict")
-        redeemed_customer_credit = data.get("redeemed_customer_credit") or invoice.get("redeemed_customer_credit")
-        if redeemed_customer_credit and not invoice_doc.payments:
-            invoice_doc.flags.pos_next_redeemed_customer_credit = flt(redeemed_customer_credit)
-
-        # Save before submit
-        invoice_doc.flags.ignore_permissions = True
-        frappe.flags.ignore_account_permission = True
-        invoice_doc.save()
-
-        # Submit invoice
-        invoice_doc.submit()
-        invoice_submitted = True
-        # Handle wallet transaction reversal for returns
-        wallet_reversal_ok = False
-        if invoice_doc.get("is_return") and invoice_doc.get("return_against"):
-            from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import reverse_wallet_transactions_for_return
-            try:
-                reverse_wallet_transactions_for_return(
-                    original_invoice=invoice_doc.return_against,
-                    return_invoice=invoice_doc.name
-                )
-                wallet_reversal_ok = True
-            except Exception as wallet_reversal_error:
-                frappe.log_error(
-                    title="Wallet Reversal Error",
-                    message=(
-                        f"Return invoice: {invoice_doc.name}, "
-                        f"Original invoice: {invoice_doc.return_against}, "
-                        f"Error: {str(wallet_reversal_error)}\n{frappe.get_traceback()}"
-                    )
-                )
-                frappe.msgprint(
-                    _("Return invoice submitted successfully, but wallet reversal failed. Please contact administrator."),
-                    alert=True,
-                    indicator="orange"
-                )
-
-        # Credit return amount to customer wallet when "Add to Customer Credit Balance" is enabled.
-        # Only proceed if the wallet reversal above succeeded (or was not needed) to
-        # avoid double-crediting the customer when reversal fails.
-        if invoice_doc.get("is_return"):
-            add_to_customer_balance = invoice.get("add_to_customer_balance")
-            has_return_against = bool(invoice_doc.get("return_against"))
-            if add_to_customer_balance and (wallet_reversal_ok or not has_return_against):
-                from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import credit_return_to_wallet
-                try:
-                    credit_return_to_wallet(
-                        return_invoice=invoice_doc.name,
-                        amount=abs(flt(invoice_doc.grand_total))
-                    )
-                except Exception as wallet_credit_error:
-                    frappe.log_error(
-                        title="Wallet Credit on Return Error",
-                        message=(
-                            f"Return invoice: {invoice_doc.name}, "
-                            f"Error: {str(wallet_credit_error)}\n{frappe.get_traceback()}"
-                        )
-                    )
-                    frappe.msgprint(
-                        _("Return submitted but wallet credit failed. Please contact administrator."),
-                        alert=True,
-                        indicator="orange"
-                    )
-        # Complete the offline sync record
-        if sync_record_name:
-            _complete_offline_sync(sync_record_name, invoice_doc.name)
-
-        # Handle credit redemption after successful submission
-        if redeemed_customer_credit and customer_credit_dict:
-            try:
-                from pos_next.api.credit_sales import redeem_customer_credit
-                redeem_customer_credit(invoice_doc.name, customer_credit_dict)
-            except Exception as credit_error:
-                frappe.log_error(
-                    title="Credit Redemption Error",
-                    message=f"Invoice: {invoice_doc.name}, Error: {str(credit_error)}\n{frappe.get_traceback()}"
-                )
-                # Don't fail the entire transaction, just log the error
-                frappe.msgprint(
-                    _("Invoice submitted successfully but credit redemption failed. Please contact administrator."),
-                    alert=True,
-                    indicator="orange"
-                )
-
-        # Log manual rate edits for audit trail (only after successful submission)
-        if doctype == DOCTYPE_SALES_INVOICE:
-            incoming_items = invoice.get("items") or []
-            for item in incoming_items:
-                if cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED)):
-                    log_manual_rate_edit({
-                        FIELD_ITEM_CODE: item.get(FIELD_ITEM_CODE),
-                        "item_name": item.get("item_name"),
-                        FIELD_RATE: flt(item.get(FIELD_RATE)),
-                        FIELD_ORIGINAL_RATE: flt(item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE)),
-                        FIELD_IS_RATE_MANUALLY_EDITED: 1
-                    }, invoice_doc.name)
-
-        # Return complete invoice details
-        result = {
-            "name": invoice_doc.name,
-            "status": invoice_doc.docstatus,
-            "grand_total": invoice_doc.grand_total,
-            "total": invoice_doc.total,
-            "net_total": invoice_doc.net_total,
-            "outstanding_amount": getattr(invoice_doc, "outstanding_amount", 0),
-            "paid_amount": getattr(invoice_doc, "paid_amount", 0),
-            "change_amount": getattr(invoice_doc, "change_amount", 0),
-        }
-
-        # Include offline_id in response for client-side tracking
-        if offline_id:
-            result["offline_id"] = offline_id
-
-        return result
-
-    except Exception as e:
-        frappe.log_error(frappe.get_traceback(), "Submit Invoice Error")
-        raise
-
-    finally:
-        # Cleanup sync record if invoice was not successfully submitted
-        if sync_record_name and not invoice_submitted:
-            _cleanup_failed_sync(sync_record_name)
+	"""Submit the invoice (Step 2)."""
+	# Handle different calling conventions
+	if invoice is None:
+		if data:
+			# Check if data is a JSON string containing both params
+			data_parsed = json.loads(data) if isinstance(data, str) else data
+
+			# frappe-ui might send all params nested in data
+			if isinstance(data_parsed, dict):
+				if "invoice" in data_parsed:
+					invoice = data_parsed.get("invoice")
+					data = data_parsed.get("data", {})
+				elif "name" in data_parsed or "doctype" in data_parsed:
+					# Data itself might be the invoice
+					invoice = data_parsed
+					data = {}
+				else:
+					frappe.throw(
+						_("Missing invoice parameter. Received data: {0}").format(
+							json.dumps(data_parsed, default=str)
+						)
+					)
+			else:
+				frappe.throw(_("Missing invoice parameter"))
+		else:
+			frappe.throw(_("Both invoice and data parameters are missing"))
+
+	# Parse JSON strings if needed
+	if isinstance(data, str):
+		data = json.loads(data) if data and data != "{}" else {}
+	if isinstance(invoice, str):
+		invoice = json.loads(invoice)
+
+	# Ensure invoice and data are dicts
+	if not isinstance(invoice, dict):
+		frappe.throw(_("Invalid invoice format"))
+		return  # Never reached, but helps type checker
+	if not isinstance(data, dict):
+		data = {}
+
+	pos_profile = invoice.get("pos_profile")
+	doctype = invoice.get("doctype", "Sales Invoice")
+
+	# Normalize pricing_rules before processing
+	standardize_pricing_rules(invoice.get("items"))
+
+	# ========================================================================
+	# OFFLINE INVOICE DEDUPLICATION
+	# ========================================================================
+	# Prevents duplicate invoice creation when the same offline invoice is
+	# submitted multiple times (e.g., network retry, multiple tabs).
+	# Uses a reservation pattern: create a "pending" record first, then
+	# update to "synced" after successful submission.
+	# ========================================================================
+	offline_id = invoice.get("offline_id") or data.get("offline_id")
+	sync_record_name = None
+
+	if offline_id:
+		dedup_result = _ensure_offline_uniqueness(
+			offline_id=offline_id, pos_profile=pos_profile, customer=invoice.get("customer")
+		)
+
+		if dedup_result and dedup_result.get("already_synced"):
+			# Invoice was already synced - return the existing invoice details
+			return dedup_result.get("invoice_data", {})
+
+		# Store the sync record name for later update
+		sync_record_name = dedup_result.get("sync_record_name") if dedup_result else None
+
+	# Track whether invoice was successfully submitted
+	invoice_submitted = False
+
+	try:
+		invoice_name = invoice.get("name")
+
+		# Get or create invoice
+		if not invoice_name or not frappe.db.exists(doctype, invoice_name):
+			created = update_invoice(json.dumps(invoice))
+			if not created or not isinstance(created, dict):
+				frappe.throw(_("Failed to create invoice draft"))
+			invoice_name = created.get("name")
+			if not invoice_name:
+				frappe.throw(_("Failed to get invoice name from draft"))
+			invoice_doc = frappe.get_doc(doctype, invoice_name)
+		else:
+			invoice_doc = frappe.get_doc(doctype, invoice_name)
+			invoice_doc.update(invoice)
+
+		# Ensure update_stock is set for Sales Invoice
+		if doctype == "Sales Invoice":
+			invoice_doc.update_stock = 1
+
+		# For return invoices, set update_outstanding_for_self = 0
+		# This ensures the GL entry's against_voucher points to the original invoice,
+		# which properly reduces the original invoice's outstanding amount and
+		# sets its status to "Credit Note Issued"
+		if invoice_doc.get("is_return") and invoice_doc.get("return_against"):
+			invoice_doc.update_outstanding_for_self = 0
+
+		# Copy accounting dimensions from POS Profile if not already set
+		if pos_profile and not invoice_doc.get("branch"):
+			try:
+				pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
+				if hasattr(pos_profile_doc, "branch") and pos_profile_doc.branch:
+					invoice_doc.branch = pos_profile_doc.branch
+					# Also set branch on all items for GL entries
+					for item in invoice_doc.get("items", []):
+						if not item.get("branch"):
+							item.branch = pos_profile_doc.branch
+			except Exception as e:
+				# Branch is optional, log and continue
+				frappe.log_error(
+					f"Failed to set branch from POS Profile {pos_profile}: {e}", "POS Profile Branch"
+				)
+
+		# Set accounts for all payment methods before saving
+		if doctype == "Sales Invoice" and hasattr(invoice_doc, "payments"):
+			_set_payment_accounts(invoice_doc.payments, invoice_doc.company)
+
+			# Calculate paid_amount and base_paid_amount from payment rows
+			# This ensures the invoice is not marked as "Pay on Account" when payments exist
+			if invoice_doc.get("payments"):
+				# For return invoices, ensure payments are negative
+				if invoice_doc.get("is_return"):
+					for payment in invoice_doc.payments:
+						payment.amount = -abs(payment.amount)
+						if payment.base_amount:
+							payment.base_amount = -abs(payment.base_amount)
+
+				# Calculate total paid amount from all payment rows
+				invoice_doc.paid_amount = flt(sum(p.amount for p in invoice_doc.payments))
+				invoice_doc.base_paid_amount = flt(sum(p.base_amount or 0 for p in invoice_doc.payments))
+
+		# Handle sales team (multiple sales persons)
+		sales_team_data = invoice.get("sales_team") or data.get("sales_team")
+		if sales_team_data and isinstance(sales_team_data, list):
+			# Clear existing sales team entries
+			invoice_doc.sales_team = []
+
+			# Add new sales team entries
+			for member in sales_team_data:
+				if member and isinstance(member, dict):
+					invoice_doc.append(
+						"sales_team",
+						{
+							"sales_person": member.get("sales_person"),
+							"allocated_percentage": member.get("allocated_percentage", 0),
+						},
+					)
+
+		# Handle POS Coupon if coupon_code is provided
+		coupon_code = invoice.get("coupon_code") or data.get("coupon_code")
+		if coupon_code:
+			# Increment usage counter for POS Coupon
+			if frappe.db.table_exists("POS Coupon"):
+				try:
+					from pos_next.pos_next.doctype.pos_coupon.pos_coupon import increment_coupon_usage
+
+					increment_coupon_usage(coupon_code)
+				except Exception as e:
+					frappe.log_error(
+						title="Failed to increment coupon usage",
+						message=f"Coupon: {coupon_code}, Error: {e!s}",
+					)
+
+		# Auto-set batch numbers for returns
+		_auto_set_return_batches(invoice_doc)
+
+		# Handle write-off amount if provided
+		write_off_amount = flt(data.get("write_off_amount") or invoice.get("write_off_amount") or 0)
+		if write_off_amount > 0 and doctype == "Sales Invoice":
+			# Get write-off account and cost center from POS Profile
+			if pos_profile:
+				try:
+					pos_profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
+					write_off_account = pos_profile_doc.write_off_account
+					write_off_cost_center = pos_profile_doc.write_off_cost_center
+					write_off_limit = flt(pos_profile_doc.write_off_limit or 0)
+
+					# Validate write-off amount is within limit
+					if write_off_limit > 0 and write_off_amount > write_off_limit:
+						frappe.throw(
+							_("Write-off amount {0} exceeds limit {1}").format(
+								write_off_amount, write_off_limit
+							)
+						)
+
+					# Set write-off fields on invoice
+					if write_off_account:
+						invoice_doc.write_off_account = write_off_account
+						invoice_doc.write_off_cost_center = write_off_cost_center
+						invoice_doc.write_off_amount = write_off_amount
+						invoice_doc.base_write_off_amount = write_off_amount  # Assuming same currency
+				except Exception as e:
+					frappe.log_error(
+						f"Failed to apply write-off from POS Profile {pos_profile}: {e}",
+						"POS Write-Off Error",
+					)
+
+		# Validate stock availability before submission
+		# _validate_stock_on_invoice checks _should_block internally
+		# (global Stock Settings, POS Settings, and POS Profile flags)
+		_validate_stock_on_invoice(invoice_doc)
+
+		# Allow pure customer-credit POS sales to submit without a payment row.
+		customer_credit_dict = data.get("customer_credit_dict") or invoice.get("customer_credit_dict")
+		redeemed_customer_credit = data.get("redeemed_customer_credit") or invoice.get(
+			"redeemed_customer_credit"
+		)
+		if redeemed_customer_credit and not invoice_doc.payments:
+			invoice_doc.flags.pos_next_redeemed_customer_credit = flt(redeemed_customer_credit)
+
+		# Save before submit
+		invoice_doc.flags.ignore_permissions = True
+		frappe.flags.ignore_account_permission = True
+		invoice_doc.save()
+
+		# Submit invoice
+		invoice_doc.submit()
+		invoice_submitted = True
+		# Handle wallet transaction reversal for returns
+		wallet_reversal_ok = False
+		if invoice_doc.get("is_return") and invoice_doc.get("return_against"):
+			from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import (
+				reverse_wallet_transactions_for_return,
+			)
+
+			try:
+				reverse_wallet_transactions_for_return(
+					original_invoice=invoice_doc.return_against, return_invoice=invoice_doc.name
+				)
+				wallet_reversal_ok = True
+			except Exception as wallet_reversal_error:
+				frappe.log_error(
+					title="Wallet Reversal Error",
+					message=(
+						f"Return invoice: {invoice_doc.name}, "
+						f"Original invoice: {invoice_doc.return_against}, "
+						f"Error: {wallet_reversal_error!s}\n{frappe.get_traceback()}"
+					),
+				)
+				frappe.msgprint(
+					_(
+						"Return invoice submitted successfully, but wallet reversal failed. Please contact administrator."
+					),
+					alert=True,
+					indicator="orange",
+				)
+
+		# Credit return amount to customer wallet when "Add to Customer Credit Balance" is enabled.
+		# Only proceed if the wallet reversal above succeeded (or was not needed) to
+		# avoid double-crediting the customer when reversal fails.
+		if invoice_doc.get("is_return"):
+			add_to_customer_balance = invoice.get("add_to_customer_balance")
+			has_return_against = bool(invoice_doc.get("return_against"))
+			if add_to_customer_balance and (wallet_reversal_ok or not has_return_against):
+				from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import (
+					credit_return_to_wallet,
+				)
+
+				try:
+					credit_return_to_wallet(
+						return_invoice=invoice_doc.name, amount=abs(flt(invoice_doc.grand_total))
+					)
+				except Exception as wallet_credit_error:
+					frappe.log_error(
+						title="Wallet Credit on Return Error",
+						message=(
+							f"Return invoice: {invoice_doc.name}, "
+							f"Error: {wallet_credit_error!s}\n{frappe.get_traceback()}"
+						),
+					)
+					frappe.msgprint(
+						_("Return submitted but wallet credit failed. Please contact administrator."),
+						alert=True,
+						indicator="orange",
+					)
+		# Complete the offline sync record
+		if sync_record_name:
+			_complete_offline_sync(sync_record_name, invoice_doc.name)
+
+		# Handle credit redemption after successful submission
+		if redeemed_customer_credit and customer_credit_dict:
+			try:
+				from pos_next.api.credit_sales import redeem_customer_credit
+
+				redeem_customer_credit(invoice_doc.name, customer_credit_dict)
+			except Exception as credit_error:
+				frappe.log_error(
+					title="Credit Redemption Error",
+					message=f"Invoice: {invoice_doc.name}, Error: {credit_error!s}\n{frappe.get_traceback()}",
+				)
+				# Don't fail the entire transaction, just log the error
+				frappe.msgprint(
+					_(
+						"Invoice submitted successfully but credit redemption failed. Please contact administrator."
+					),
+					alert=True,
+					indicator="orange",
+				)
+
+		# Log manual rate edits for audit trail (only after successful submission)
+		if doctype == DOCTYPE_SALES_INVOICE:
+			incoming_items = invoice.get("items") or []
+			for item in incoming_items:
+				if cint(item.get(FIELD_IS_RATE_MANUALLY_EDITED)):
+					log_manual_rate_edit(
+						{
+							FIELD_ITEM_CODE: item.get(FIELD_ITEM_CODE),
+							"item_name": item.get("item_name"),
+							FIELD_RATE: flt(item.get(FIELD_RATE)),
+							FIELD_ORIGINAL_RATE: flt(
+								item.get(FIELD_ORIGINAL_RATE) or item.get(FIELD_PRICE_LIST_RATE)
+							),
+							FIELD_IS_RATE_MANUALLY_EDITED: 1,
+						},
+						invoice_doc.name,
+					)
+
+		# Return complete invoice details
+		result = {
+			"name": invoice_doc.name,
+			"status": invoice_doc.docstatus,
+			"grand_total": invoice_doc.grand_total,
+			"total": invoice_doc.total,
+			"net_total": invoice_doc.net_total,
+			"outstanding_amount": getattr(invoice_doc, "outstanding_amount", 0),
+			"paid_amount": getattr(invoice_doc, "paid_amount", 0),
+			"change_amount": getattr(invoice_doc, "change_amount", 0),
+		}
+
+		# Include offline_id in response for client-side tracking
+		if offline_id:
+			result["offline_id"] = offline_id
+
+		return result
+
+	except Exception:
+		frappe.log_error(frappe.get_traceback(), "Submit Invoice Error")
+		raise
+
+	finally:
+		# Cleanup sync record if invoice was not successfully submitted
+		if sync_record_name and not invoice_submitted:
+			_cleanup_failed_sync(sync_record_name)
 
 
 # ==========================================
@@ -1548,16 +1542,14 @@ def get_invoices(pos_profile, limit=100):
 		frappe.throw(_("POS Profile is required"))
 
 	# Check if user has access to this POS Profile
-	has_access = frappe.db.exists(
-		"POS Profile User",
-		{"parent": pos_profile, "user": frappe.session.user}
-	)
+	has_access = frappe.db.exists("POS Profile User", {"parent": pos_profile, "user": frappe.session.user})
 
 	if not has_access and not frappe.has_permission("Sales Invoice", "read"):
 		frappe.throw(_("You don't have access to this POS Profile"))
 
 	# Query for invoices
-	invoices = frappe.db.sql("""
+	invoices = frappe.db.sql(
+		"""
 		SELECT
 			name,
 			customer,
@@ -1581,14 +1573,15 @@ def get_invoices(pos_profile, limit=100):
 			posting_date DESC,
 			posting_time DESC
 		LIMIT %(limit)s
-	""", {
-		"pos_profile": pos_profile,
-		"limit": limit
-	}, as_dict=True)
+	""",
+		{"pos_profile": pos_profile, "limit": limit},
+		as_dict=True,
+	)
 
 	# Load items for each invoice for filtering purposes
 	for invoice in invoices:
-		items = frappe.db.sql("""
+		items = frappe.db.sql(
+			"""
 			SELECT
 				item_code,
 				item_name,
@@ -1601,9 +1594,10 @@ def get_invoices(pos_profile, limit=100):
 				parent = %(invoice_name)s
 			ORDER BY
 				idx
-		""", {
-			"invoice_name": invoice.name
-		}, as_dict=True)
+		""",
+			{"invoice_name": invoice.name},
+			as_dict=True,
+		)
 		invoice.items = items
 
 	return invoices
@@ -1616,95 +1610,93 @@ def get_invoices(pos_profile, limit=100):
 
 @frappe.whitelist()
 def get_draft_invoices(pos_opening_shift, doctype="Sales Invoice"):
-    """Get all draft invoices for a POS opening shift."""
-    filters = {
-        "docstatus": 0,
-    }
-
-    # Add pos_opening_shift filter if the field exists
-    if frappe.db.has_column(doctype, "pos_opening_shift"):
-        filters["pos_opening_shift"] = pos_opening_shift
-
-    # Performance: Get all invoice names first
-    invoices_list = frappe.get_list(
-        doctype,
-        filters=filters,
-        fields=["name"],
-        limit_page_length=0,
-        order_by="modified desc",
-    )
+	"""Get all draft invoices for a POS opening shift."""
+	filters = {
+		"docstatus": 0,
+	}
+
+	# Add pos_opening_shift filter if the field exists
+	if frappe.db.has_column(doctype, "pos_opening_shift"):
+		filters["pos_opening_shift"] = pos_opening_shift
+
+	# Performance: Get all invoice names first
+	invoices_list = frappe.get_list(
+		doctype,
+		filters=filters,
+		fields=["name"],
+		limit_page_length=0,
+		order_by="modified desc",
+	)
 
-    # Performance: Batch load all documents at once using get_cached_doc
-    # This leverages Frappe's internal caching and is faster than individual queries
-    data = []
-    for invoice in invoices_list:
-        data.append(frappe.get_cached_doc(doctype, invoice["name"]))
+	# Performance: Batch load all documents at once using get_cached_doc
+	# This leverages Frappe's internal caching and is faster than individual queries
+	data = []
+	for invoice in invoices_list:
+		data.append(frappe.get_cached_doc(doctype, invoice["name"]))
 
-    return data
+	return data
 
 
 @frappe.whitelist()
 def delete_invoice(invoice):
-    """Delete draft invoice."""
-    doctype = "Sales Invoice"
+	"""Delete draft invoice."""
+	doctype = "Sales Invoice"
 
-    if not frappe.db.exists(doctype, invoice):
-        frappe.throw(_("Invoice {0} does not exist").format(invoice))
+	if not frappe.db.exists(doctype, invoice):
+		frappe.throw(_("Invoice {0} does not exist").format(invoice))
 
-    # Check if it's a draft
-    if frappe.db.get_value(doctype, invoice, "docstatus") != 0:
-        frappe.throw(_("Cannot delete submitted invoice {0}").format(invoice))
+	# Check if it's a draft
+	if frappe.db.get_value(doctype, invoice, "docstatus") != 0:
+		frappe.throw(_("Cannot delete submitted invoice {0}").format(invoice))
 
-    frappe.delete_doc(doctype, invoice, force=1)
-    return _("Invoice {0} Deleted").format(invoice)
+	frappe.delete_doc(doctype, invoice, force=1)
+	return _("Invoice {0} Deleted").format(invoice)
 
 
 @frappe.whitelist()
 def cleanup_old_drafts(pos_profile=None, max_age_hours=48):
-    """
-    Clean up old draft invoices to prevent stock reservation issues.
-    Deletes drafts older than max_age_hours (default 24 hours).
-    """
-    from datetime import datetime, timedelta
-
-    doctype = "Sales Invoice"
-    cutoff_time = datetime.now() - timedelta(hours=int(max_age_hours))
-
-    filters = {
-        "docstatus": 0,  # Draft only
-        "is_pos": 1,  # Only POS Sales Invoices
-        "modified": ["<", cutoff_time.strftime("%Y-%m-%d %H:%M:%S")],
-    }
-
-    # Optionally filter by POS profile
-    if pos_profile:
-        filters["pos_profile"] = pos_profile
-
-    # Get old drafts
-    old_drafts = frappe.get_all(
-        doctype,
-        filters=filters,
-        fields=["name", "modified"],
-        limit_page_length=100,  # Safety limit
-    )
-
-    deleted_count = 0
-    for draft in old_drafts:
-        try:
-            frappe.delete_doc(
-                doctype, draft["name"], force=True, ignore_permissions=True
-            )
-            deleted_count += 1
-        except Exception as e:
-            frappe.log_error(
-                f"Failed to delete draft {draft['name']}: {str(e)}",
-                "Draft Cleanup Error",
-            )
-
-    return {
-        "deleted": deleted_count,
-        "message": f"Cleaned up {deleted_count} old draft invoices",
-    }
+	"""
+	Clean up old draft invoices to prevent stock reservation issues.
+	Deletes drafts older than max_age_hours (default 24 hours).
+	"""
+	from datetime import datetime, timedelta
+
+	doctype = "Sales Invoice"
+	cutoff_time = datetime.now() - timedelta(hours=int(max_age_hours))
+
+	filters = {
+		"docstatus": 0,  # Draft only
+		"is_pos": 1,  # Only POS Sales Invoices
+		"modified": ["<", cutoff_time.strftime("%Y-%m-%d %H:%M:%S")],
+	}
+
+	# Optionally filter by POS profile
+	if pos_profile:
+		filters["pos_profile"] = pos_profile
+
+	# Get old drafts
+	old_drafts = frappe.get_all(
+		doctype,
+		filters=filters,
+		fields=["name", "modified"],
+		limit_page_length=100,  # Safety limit
+	)
+
+	deleted_count = 0
+	for draft in old_drafts:
+		try:
+			frappe.delete_doc(doctype, draft["name"], force=True, ignore_permissions=True)
+			deleted_count += 1
+		except Exception as e:
+			frappe.log_error(
+				f"Failed to delete draft {draft['name']}: {e!s}",
+				"Draft Cleanup Error",
+			)
+
+	return {
+		"deleted": deleted_count,
+		"message": f"Cleaned up {deleted_count} old draft invoices",
+	}
 
 
 # ==========================================
@@ -1713,939 +1705,898 @@ def cleanup_old_drafts(pos_profile=None, max_age_hours=48):
 
 
 def _filter_fully_returned(invoices):
-    """Remove invoices where all items have already been returned.
-
-    Uses two targeted queries instead of a 4-table LEFT JOIN to avoid
-    cartesian explosion (SI × SI_Item × Ret_SI × Ret_Item).
-    Only touches the small candidate set passed in.
-    """
-    if not invoices:
-        return []
-
-    from frappe.query_builder.functions import Sum, Abs
-
-    invoice_names = [inv["name"] for inv in invoices]
-
-    # Original qty per invoice
-    si_item = frappe.qb.DocType("Sales Invoice Item")
-    orig_rows = (
-        frappe.qb.from_(si_item)
-        .select(si_item.parent, Sum(si_item.qty).as_("total_original_qty"))
-        .where(si_item.parent.isin(invoice_names))
-        .groupby(si_item.parent)
-    ).run(as_dict=True)
-    orig_map = {r["parent"]: flt(r["total_original_qty"]) for r in orig_rows}
-
-    # Returned qty per original invoice
-    ret_si = frappe.qb.DocType("Sales Invoice")
-    ret_item = frappe.qb.DocType("Sales Invoice Item")
-    ret_rows = (
-        frappe.qb.from_(ret_si)
-        .inner_join(ret_item).on(ret_item.parent == ret_si.name)
-        .select(ret_si.return_against, Sum(Abs(ret_item.qty)).as_("total_returned_qty"))
-        .where(
-            (ret_si.return_against.isin(invoice_names))
-            & (ret_si.docstatus == 1)
-            & (ret_si.is_return == 1)
-        )
-        .groupby(ret_si.return_against)
-    ).run(as_dict=True)
-    ret_map = {r["return_against"]: flt(r["total_returned_qty"]) for r in ret_rows}
-
-    for inv in invoices:
-        inv["total_original_qty"] = orig_map.get(inv["name"], 0)
-        inv["total_returned_qty"] = ret_map.get(inv["name"], 0)
-
-    return [
-        inv for inv in invoices
-        if inv["total_original_qty"] > inv["total_returned_qty"]
-    ]
+	"""Remove invoices where all items have already been returned.
+
+	Uses two targeted queries instead of a 4-table LEFT JOIN to avoid
+	cartesian explosion (SI x SI_Item x Ret_SI x Ret_Item).
+	Only touches the small candidate set passed in.
+	"""
+	if not invoices:
+		return []
+
+	from frappe.query_builder.functions import Abs, Sum
+
+	invoice_names = [inv["name"] for inv in invoices]
+
+	# Original qty per invoice
+	si_item = frappe.qb.DocType("Sales Invoice Item")
+	orig_rows = (
+		frappe.qb.from_(si_item)
+		.select(si_item.parent, Sum(si_item.qty).as_("total_original_qty"))
+		.where(si_item.parent.isin(invoice_names))
+		.groupby(si_item.parent)
+	).run(as_dict=True)
+	orig_map = {r["parent"]: flt(r["total_original_qty"]) for r in orig_rows}
+
+	# Returned qty per original invoice
+	ret_si = frappe.qb.DocType("Sales Invoice")
+	ret_item = frappe.qb.DocType("Sales Invoice Item")
+	ret_rows = (
+		frappe.qb.from_(ret_si)
+		.inner_join(ret_item)
+		.on(ret_item.parent == ret_si.name)
+		.select(ret_si.return_against, Sum(Abs(ret_item.qty)).as_("total_returned_qty"))
+		.where(
+			(ret_si.return_against.isin(invoice_names)) & (ret_si.docstatus == 1) & (ret_si.is_return == 1)
+		)
+		.groupby(ret_si.return_against)
+	).run(as_dict=True)
+	ret_map = {r["return_against"]: flt(r["total_returned_qty"]) for r in ret_rows}
+
+	for inv in invoices:
+		inv["total_original_qty"] = orig_map.get(inv["name"], 0)
+		inv["total_returned_qty"] = ret_map.get(inv["name"], 0)
+
+	return [inv for inv in invoices if inv["total_original_qty"] > inv["total_returned_qty"]]
 
 
 @frappe.whitelist()
 def get_returnable_invoices(limit=50, pos_profile=None):
-    """Get list of invoices that have items available for return.
-    Filters by return validity period if configured in POS Settings.
-
-    Two-step approach for performance:
-    1. Fetch recent POS invoices (fast indexed query, no JOINs)
-    2. Filter out fully-returned ones via _filter_fully_returned
-    """
-    from frappe.utils import add_days, today
-
-    # Check return validity days from POS Settings
-    return_validity_days = 0
-    if pos_profile:
-        return_validity_days = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": pos_profile},
-                "return_validity_days"
-            ) or 0
-        )
-
-    si = frappe.qb.DocType("Sales Invoice")
-
-    # Over-fetch to compensate for fully-returned invoices removed in step 2
-    fetch_limit = cint(limit) * 2
-
-    # Step 1: fetch candidates (lightweight, no JOINs)
-    query = (
-        frappe.qb.from_(si)
-        .select(
-            si.name, si.customer, si.customer_name,
-            si.contact_mobile, si.posting_date,
-            si.grand_total, si.status,
-        )
-        .where(
-            (si.docstatus == 1)
-            & (si.is_return == 0)
-            & (si.is_pos == 1)
-        )
-        .orderby(si.posting_date, order=frappe.qb.desc)
-        .orderby(si.creation, order=frappe.qb.desc)
-        .limit(fetch_limit)
-    )
-
-    if return_validity_days > 0:
-        cutoff_date = add_days(today(), -return_validity_days)
-        query = query.where(si.posting_date >= cutoff_date)
-
-    candidates = query.run(as_dict=True)
-
-    # Step 2: filter out fully-returned invoices, then trim to requested limit
-    return _filter_fully_returned(candidates)[:cint(limit)]
+	"""Get list of invoices that have items available for return.
+	Filters by return validity period if configured in POS Settings.
+
+	Two-step approach for performance:
+	1. Fetch recent POS invoices (fast indexed query, no JOINs)
+	2. Filter out fully-returned ones via _filter_fully_returned
+	"""
+	from frappe.utils import add_days, today
+
+	# Check return validity days from POS Settings
+	return_validity_days = 0
+	if pos_profile:
+		return_validity_days = cint(
+			frappe.db.get_value("POS Next Settings", {"pos_profile": pos_profile}, "return_validity_days")
+			or 0
+		)
+
+	si = frappe.qb.DocType("Sales Invoice")
+
+	# Over-fetch to compensate for fully-returned invoices removed in step 2
+	fetch_limit = cint(limit) * 2
+
+	# Step 1: fetch candidates (lightweight, no JOINs)
+	query = (
+		frappe.qb.from_(si)
+		.select(
+			si.name,
+			si.customer,
+			si.customer_name,
+			si.contact_mobile,
+			si.posting_date,
+			si.grand_total,
+			si.status,
+		)
+		.where((si.docstatus == 1) & (si.is_return == 0) & (si.is_pos == 1))
+		.orderby(si.posting_date, order=frappe.qb.desc)
+		.orderby(si.creation, order=frappe.qb.desc)
+		.limit(fetch_limit)
+	)
+
+	if return_validity_days > 0:
+		cutoff_date = add_days(today(), -return_validity_days)
+		query = query.where(si.posting_date >= cutoff_date)
+
+	candidates = query.run(as_dict=True)
+
+	# Step 2: filter out fully-returned invoices, then trim to requested limit
+	return _filter_fully_returned(candidates)[: cint(limit)]
 
 
 @frappe.whitelist()
 def search_invoice_by_number(search_term, pos_profile=None):
-    """Search for invoices by invoice number across the entire database.
-    No date restrictions - searches all returnable invoices matching the term.
-
-    Two-step approach for performance:
-    1. Find matching POS invoices by name (fast indexed LIKE query)
-    2. Filter out fully-returned ones via _filter_fully_returned
-
-    Args:
-        search_term: Invoice number or partial number to search for (min 3 chars)
-        pos_profile: Optional POS profile for context (reserved for future use)
-
-    Returns:
-        List of matching invoices with return availability info (max 10 results)
-    """
-    if not search_term or len(search_term) < 3:
-        return []
-
-    # Escape LIKE wildcards in user input to prevent pattern abuse.
-    # frappe.db.escape() returns a quoted string for raw SQL — not usable with
-    # frappe.qb's .like() which parameterizes internally. Manual escaping needed.
-    search_term = cstr(search_term).strip().replace("%", r"\%").replace("_", r"\_")
-    si = frappe.qb.DocType("Sales Invoice")
-
-    # Step 1: find matching invoices (lightweight, no JOINs)
-    candidates = (
-        frappe.qb.from_(si)
-        .select(
-            si.name, si.customer, si.customer_name,
-            si.contact_mobile, si.posting_date,
-            si.grand_total, si.status,
-        )
-        .where(
-            (si.docstatus == 1)
-            & (si.is_return == 0)
-            & (si.is_pos == 1)
-            & (si.name.like(f"%{search_term}%"))
-        )
-        .orderby(si.posting_date, order=frappe.qb.desc)
-        .orderby(si.creation, order=frappe.qb.desc)
-        .limit(10)
-    ).run(as_dict=True)
-
-    # Step 2: filter out fully-returned invoices
-    return _filter_fully_returned(candidates)
+	"""Search for invoices by invoice number across the entire database.
+	No date restrictions - searches all returnable invoices matching the term.
+
+	Two-step approach for performance:
+	1. Find matching POS invoices by name (fast indexed LIKE query)
+	2. Filter out fully-returned ones via _filter_fully_returned
+
+	Args:
+	    search_term: Invoice number or partial number to search for (min 3 chars)
+	    pos_profile: Optional POS profile for context (reserved for future use)
+
+	Returns:
+	    List of matching invoices with return availability info (max 10 results)
+	"""
+	if not search_term or len(search_term) < 3:
+		return []
+
+	# Escape LIKE wildcards in user input to prevent pattern abuse.
+	# frappe.db.escape() returns a quoted string for raw SQL — not usable with
+	# frappe.qb's .like() which parameterizes internally. Manual escaping needed.
+	search_term = cstr(search_term).strip().replace("%", r"\%").replace("_", r"\_")
+	si = frappe.qb.DocType("Sales Invoice")
+
+	# Step 1: find matching invoices (lightweight, no JOINs)
+	candidates = (
+		frappe.qb.from_(si)
+		.select(
+			si.name,
+			si.customer,
+			si.customer_name,
+			si.contact_mobile,
+			si.posting_date,
+			si.grand_total,
+			si.status,
+		)
+		.where(
+			(si.docstatus == 1) & (si.is_return == 0) & (si.is_pos == 1) & (si.name.like(f"%{search_term}%"))
+		)
+		.orderby(si.posting_date, order=frappe.qb.desc)
+		.orderby(si.creation, order=frappe.qb.desc)
+		.limit(10)
+	).run(as_dict=True)
+
+	# Step 2: filter out fully-returned invoices
+	return _filter_fully_returned(candidates)
 
 
 @frappe.whitelist()
 def check_invoice_return_validity(invoice_name):
-    """Check if an invoice is within the return validity period.
-
-    Returns detailed information for the UI to display, including:
-    - valid: Boolean indicating if return is allowed
-    - error_type: 'not_found' or 'return_period_expired' if invalid
-    - Additional context (invoice_date, days_since, allowed_days) for expired returns
-    """
-    from frappe.utils import date_diff, getdate, formatdate
-
-    # Fetch only the fields needed for validation
-    si = frappe.qb.DocType("Sales Invoice")
-    invoice_data = (
-        frappe.qb.from_(si)
-        .select(si.pos_profile, si.posting_date)
-        .where(si.name == invoice_name)
-    ).run(as_dict=True)
-
-    if not invoice_data:
-        return {
-            "valid": False,
-            "error_type": "not_found",
-            "message": _("Invoice {0} does not exist").format(invoice_name)
-        }
-
-    invoice_info = invoice_data[0]
-
-    # Check return validity period from POS Settings
-    if invoice_info.pos_profile:
-        return_validity_days = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": invoice_info.pos_profile},
-                "return_validity_days"
-            ) or 0
-        )
-
-        if return_validity_days > 0:
-            days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
-            if days_since_invoice > return_validity_days:
-                return {
-                    "valid": False,
-                    "error_type": "return_period_expired",
-                    "invoice_name": invoice_name,
-                    "invoice_date": formatdate(invoice_info.posting_date),
-                    "days_since": days_since_invoice,
-                    "allowed_days": return_validity_days,
-                    "message": _("Return period has expired")
-                }
-
-    return {"valid": True}
+	"""Check if an invoice is within the return validity period.
+
+	Returns detailed information for the UI to display, including:
+	- valid: Boolean indicating if return is allowed
+	- error_type: 'not_found' or 'return_period_expired' if invalid
+	- Additional context (invoice_date, days_since, allowed_days) for expired returns
+	"""
+	from frappe.utils import date_diff, formatdate, getdate
+
+	# Fetch only the fields needed for validation
+	si = frappe.qb.DocType("Sales Invoice")
+	invoice_data = (
+		frappe.qb.from_(si).select(si.pos_profile, si.posting_date).where(si.name == invoice_name)
+	).run(as_dict=True)
+
+	if not invoice_data:
+		return {
+			"valid": False,
+			"error_type": "not_found",
+			"message": _("Invoice {0} does not exist").format(invoice_name),
+		}
+
+	invoice_info = invoice_data[0]
+
+	# Check return validity period from POS Settings
+	if invoice_info.pos_profile:
+		return_validity_days = cint(
+			frappe.db.get_value(
+				"POS Next Settings", {"pos_profile": invoice_info.pos_profile}, "return_validity_days"
+			)
+			or 0
+		)
+
+		if return_validity_days > 0:
+			days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
+			if days_since_invoice > return_validity_days:
+				return {
+					"valid": False,
+					"error_type": "return_period_expired",
+					"invoice_name": invoice_name,
+					"invoice_date": formatdate(invoice_info.posting_date),
+					"days_since": days_since_invoice,
+					"allowed_days": return_validity_days,
+					"message": _("Return period has expired"),
+				}
+
+	return {"valid": True}
 
 
 @frappe.whitelist()
 def get_invoice_for_return(invoice_name):
-    """Get invoice with return tracking - calculates remaining qty for each item.
-    Also validates return validity period based on POS Settings.
-
-    Returns the full invoice document with each item's qty adjusted to show
-    only the remaining returnable quantity (original qty minus already returned).
-    """
-    from frappe.utils import date_diff, getdate
-    from frappe.query_builder.functions import Sum, Abs, Coalesce
-
-    # Validate invoice exists and get fields needed for return period check
-    si = frappe.qb.DocType("Sales Invoice")
-    invoice_check = (
-        frappe.qb.from_(si)
-        .select(si.pos_profile, si.posting_date)
-        .where(si.name == invoice_name)
-    ).run(as_dict=True)
-
-    if not invoice_check:
-        frappe.throw(_("Invoice {0} does not exist").format(invoice_name))
-
-    invoice_info = invoice_check[0]
-
-    # Check return validity period from POS Settings
-    if invoice_info.pos_profile:
-        return_validity_days = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": invoice_info.pos_profile},
-                "return_validity_days"
-            ) or 0
-        )
-
-        if return_validity_days > 0:
-            days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
-            if days_since_invoice > return_validity_days:
-                frappe.throw(
-                    _("Return period has expired. Invoice {0} was created {1} days ago. "
-                      "Returns are only allowed within {2} days of purchase.").format(
-                        invoice_name, days_since_invoice, return_validity_days
-                    )
-                )
-
-    # Aggregate quantities already returned from previous return invoices.
-    # Uses COALESCE to match by sales_invoice_item (row ID) first, then item_code as fallback.
-    ret_si = frappe.qb.DocType("Sales Invoice")
-    ret_item = frappe.qb.DocType("Sales Invoice Item")
-
-    returned_qty_results = (
-        frappe.qb.from_(ret_si)
-        .inner_join(ret_item).on(ret_item.parent == ret_si.name)
-        .select(
-            Coalesce(ret_item.sales_invoice_item, ret_item.item_code).as_("key_field"),
-            Sum(Abs(ret_item.qty)).as_("returned_qty")
-        )
-        .where(
-            (ret_si.return_against == invoice_name)
-            & (ret_si.docstatus == 1)
-            & (ret_si.is_return == 1)
-        )
-        .groupby(Coalesce(ret_item.sales_invoice_item, ret_item.item_code))
-    ).run(as_dict=True)
-
-    returned_qty = {row["key_field"]: flt(row["returned_qty"]) for row in returned_qty_results}
-
-    # Get the full invoice document (needed for complete response)
-    invoice = frappe.get_doc("Sales Invoice", invoice_name)
-    invoice_dict = invoice.as_dict()
-
-    # Calculate remaining quantities
-    updated_items = []
-    for item in invoice_dict.get("items", []):
-        # Check how much has been returned using the item's name (row ID)
-        already_returned = returned_qty.get(item.name, 0)
-        remaining_qty = flt(item.qty) - already_returned
-
-        if remaining_qty > 0:
-            item_copy = item.copy()
-            item_copy["original_qty"] = item.qty
-            item_copy["qty"] = remaining_qty
-            item_copy["already_returned"] = already_returned
-            updated_items.append(item_copy)
-
-    invoice_dict["items"] = updated_items
-    return invoice_dict
+	"""Get invoice with return tracking - calculates remaining qty for each item.
+	Also validates return validity period based on POS Settings.
+
+	Returns the full invoice document with each item's qty adjusted to show
+	only the remaining returnable quantity (original qty minus already returned).
+	"""
+	from frappe.query_builder.functions import Abs, Coalesce, Sum
+	from frappe.utils import date_diff, getdate
+
+	# Validate invoice exists and get fields needed for return period check
+	si = frappe.qb.DocType("Sales Invoice")
+	invoice_check = (
+		frappe.qb.from_(si).select(si.pos_profile, si.posting_date).where(si.name == invoice_name)
+	).run(as_dict=True)
+
+	if not invoice_check:
+		frappe.throw(_("Invoice {0} does not exist").format(invoice_name))
+
+	invoice_info = invoice_check[0]
+
+	# Check return validity period from POS Settings
+	if invoice_info.pos_profile:
+		return_validity_days = cint(
+			frappe.db.get_value(
+				"POS Next Settings", {"pos_profile": invoice_info.pos_profile}, "return_validity_days"
+			)
+			or 0
+		)
+
+		if return_validity_days > 0:
+			days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
+			if days_since_invoice > return_validity_days:
+				frappe.throw(
+					_(
+						"Return period has expired. Invoice {0} was created {1} days ago. "
+						"Returns are only allowed within {2} days of purchase."
+					).format(invoice_name, days_since_invoice, return_validity_days)
+				)
+
+	# Aggregate quantities already returned from previous return invoices.
+	# Uses COALESCE to match by sales_invoice_item (row ID) first, then item_code as fallback.
+	ret_si = frappe.qb.DocType("Sales Invoice")
+	ret_item = frappe.qb.DocType("Sales Invoice Item")
+
+	returned_qty_results = (
+		frappe.qb.from_(ret_si)
+		.inner_join(ret_item)
+		.on(ret_item.parent == ret_si.name)
+		.select(
+			Coalesce(ret_item.sales_invoice_item, ret_item.item_code).as_("key_field"),
+			Sum(Abs(ret_item.qty)).as_("returned_qty"),
+		)
+		.where((ret_si.return_against == invoice_name) & (ret_si.docstatus == 1) & (ret_si.is_return == 1))
+		.groupby(Coalesce(ret_item.sales_invoice_item, ret_item.item_code))
+	).run(as_dict=True)
+
+	returned_qty = {row["key_field"]: flt(row["returned_qty"]) for row in returned_qty_results}
+
+	# Get the full invoice document (needed for complete response)
+	invoice = frappe.get_doc("Sales Invoice", invoice_name)
+	invoice_dict = invoice.as_dict()
+
+	# Calculate remaining quantities
+	updated_items = []
+	for item in invoice_dict.get("items", []):
+		# Check how much has been returned using the item's name (row ID)
+		already_returned = returned_qty.get(item.name, 0)
+		remaining_qty = flt(item.qty) - already_returned
+
+		if remaining_qty > 0:
+			item_copy = item.copy()
+			item_copy["original_qty"] = item.qty
+			item_copy["qty"] = remaining_qty
+			item_copy["already_returned"] = already_returned
+			updated_items.append(item_copy)
+
+	invoice_dict["items"] = updated_items
+	return invoice_dict
 
 
 def _parse_item_wise_tax_detail(raw_detail):
-    """Parse item_wise_tax_detail from string or dict format."""
-    if not raw_detail:
-        return {}
-    if isinstance(raw_detail, str):
-        return json.loads(raw_detail)
-    return raw_detail
+	"""Parse item_wise_tax_detail from string or dict format."""
+	if not raw_detail:
+		return {}
+	if isinstance(raw_detail, str):
+		return json.loads(raw_detail)
+	return raw_detail
 
 
 def _build_item_tax_map(taxes: list) -> dict:
-    """Build item_code -> tax_amount map from taxes child table.
+	"""Build item_code -> tax_amount map from taxes child table.
 
-    Args:
-        taxes: List of tax row dicts containing item_wise_tax_detail
+	Args:
+	    taxes: List of tax row dicts containing item_wise_tax_detail
 
-    Returns:
-        Dict mapping item_code to total tax amount (absolute value)
+	Returns:
+	    Dict mapping item_code to total tax amount (absolute value)
+
+	Note:
+	    item_wise_tax_detail format: {"ITEM-CODE": [tax_rate, tax_amount]}
+	    Return documents have negative amounts, hence abs() is used.
+	"""
+	from collections import defaultdict
 
-    Note:
-        item_wise_tax_detail format: {"ITEM-CODE": [tax_rate, tax_amount]}
-        Return documents have negative amounts, hence abs() is used.
-    """
-    from collections import defaultdict
-    tax_map = defaultdict(float)
+	tax_map = defaultdict(float)
 
-    for tax_row in taxes:
-        try:
-            details = _parse_item_wise_tax_detail(tax_row.get("item_wise_tax_detail"))
-            for item_code, (_, tax_amount) in details.items():
-                tax_map[item_code] += abs(flt(tax_amount))
-        except (json.JSONDecodeError, TypeError, ValueError, KeyError):
-            continue
+	for tax_row in taxes:
+		try:
+			details = _parse_item_wise_tax_detail(tax_row.get("item_wise_tax_detail"))
+			for item_code, (_, tax_amount) in details.items():
+				tax_map[item_code] += abs(flt(tax_amount))
+		except (json.JSONDecodeError, TypeError, ValueError, KeyError):
+			continue
 
-    return dict(tax_map)
+	return dict(tax_map)
 
 
 def _remap_foreign_payment_modes(payments_data, current_profile, original_profile):
-    """Remap payment modes that don't belong to the current POS profile.
-
-    Cross-branch returns problem:
-        Each POS branch has its own cash Mode of Payment that maps to a
-        dedicated GL cash account (e.g. "Boulaq Cash" -> account 12114,
-        "Cash lebanon" -> account 12123). When a customer returns an invoice
-        that was originally sold at a different branch, ERPNext's
-        make_sales_return() copies the *original* branch's payment modes.
-
-        If we don't remap, two things go wrong:
-        1. GL entries: the refund is posted against the wrong branch's cash
-           account (e.g. crediting Lebanon's cash instead of Boulaq's).
-        2. Shift closing: the foreign mode creates an orphan payment row
-           that doesn't exist in the current profile's opening balance,
-           blocking reconciliation.
-
-    Remapping strategy:
-        Modes are matched by their Mode of Payment *type* field:
-        - Cash -> Cash  (e.g. "Cash lebanon" -> "Boulaq Cash")
-        - Bank -> Bank  (e.g. "Lebanon Visa" -> "Visa")
-        - General -> first available in profile, or cash fallback
-
-        This ensures the GL account matches the physical cash drawer or
-        bank account at the branch where the return is processed.
-
-    Fallback chain for default mode:
-        1. POS Profile.posa_cash_mode_of_payment (explicit cash mode config)
-        2. First mode with type "Cash" in the profile
-        3. First mode in the profile (any type)
-
-    When remapping is skipped (no-op):
-        - Same profile (current == original)
-        - No current_profile provided
-        - All original modes already exist in the current profile
-        - No default_mode could be determined (empty profile)
-
-    Args:
-        payments_data: list of frappe._dict with mode_of_payment, amount, etc.
-                       (from Sales Invoice Payment child table of original invoice)
-        current_profile: POS Profile name where the return is being processed
-        original_profile: POS Profile name where the original sale happened
-
-    Returns:
-        The same payments_data list with mode_of_payment remapped in-place.
-        Shared modes (e.g. "Visa" exists in both profiles) are left unchanged.
-
-    Example:
-        Original invoice (profile "2- Lebanon"):
-            payments = [{"mode_of_payment": "Cash lebanon", "amount": 3240}]
-
-        Current profile "4- Boulaq" has modes:
-            [{"mode_of_payment": "Boulaq Cash", type: "Cash"},
-             {"mode_of_payment": "Visa",        type: "Bank"}]
-
-        After remap:
-            payments = [{"mode_of_payment": "Boulaq Cash", "amount": 3240}]
-
-        "Cash lebanon" (type=Cash) -> "Boulaq Cash" (type=Cash)
-    """
-    if not current_profile or current_profile == original_profile:
-        return payments_data
-
-    # Get current profile's payment modes
-    current_modes = {
-        row.mode_of_payment
-        for row in frappe.get_all(
-            "POS Payment Method",
-            filters={"parent": current_profile, "parenttype": "POS Profile"},
-            fields=["mode_of_payment"],
-        )
-    }
-
-    # Check if any payment needs remapping
-    needs_remap = any(p.mode_of_payment not in current_modes for p in payments_data)
-    if not needs_remap:
-        return payments_data
-
-    # Build type->mode map for the current profile.
-    # Uses setdefault so the first mode of each type wins (matches profile order).
-    mop = frappe.qb.DocType("Mode of Payment")
-    ppm = frappe.qb.DocType("POS Payment Method")
-    current_type_map = {}
-    rows = (
-        frappe.qb.from_(ppm)
-        .inner_join(mop).on(mop.name == ppm.mode_of_payment)
-        .select(ppm.mode_of_payment, mop.type)
-        .where(
-            (ppm.parent == current_profile)
-            & (ppm.parenttype == "POS Profile")
-        )
-    ).run(as_dict=True)
-
-    for row in rows:
-        current_type_map.setdefault(row.type, row.mode_of_payment)
-
-    # Default fallback: posa_cash_mode_of_payment > first Cash type > first mode
-    default_mode = (
-        frappe.db.get_value("POS Profile", current_profile, "posa_cash_mode_of_payment")
-        or current_type_map.get("Cash")
-        or (rows[0].mode_of_payment if rows else None)
-    )
-
-    if not default_mode:
-        return payments_data
-
-    # Fetch the type for each foreign mode in a single query
-    foreign_modes = [p.mode_of_payment for p in payments_data if p.mode_of_payment not in current_modes]
-    foreign_types = {}
-    if foreign_modes:
-        type_rows = frappe.get_all(
-            "Mode of Payment",
-            filters={"name": ["in", foreign_modes]},
-            fields=["name", "type"],
-        )
-        foreign_types = {r.name: r.type for r in type_rows}
-
-    # Remap: foreign Cash -> current Cash, foreign Bank -> current Bank, etc.
-    # If no type match in current profile, fall back to default_mode.
-    for payment in payments_data:
-        if payment.mode_of_payment in current_modes:
-            continue
-        foreign_type = foreign_types.get(payment.mode_of_payment)
-        payment.mode_of_payment = current_type_map.get(foreign_type, default_mode)
-
-    return payments_data
+	"""Remap payment modes that don't belong to the current POS profile.
+
+	Cross-branch returns problem:
+	    Each POS branch has its own cash Mode of Payment that maps to a
+	    dedicated GL cash account (e.g. "Boulaq Cash" -> account 12114,
+	    "Cash lebanon" -> account 12123). When a customer returns an invoice
+	    that was originally sold at a different branch, ERPNext's
+	    make_sales_return() copies the *original* branch's payment modes.
+
+	    If we don't remap, two things go wrong:
+	    1. GL entries: the refund is posted against the wrong branch's cash
+	       account (e.g. crediting Lebanon's cash instead of Boulaq's).
+	    2. Shift closing: the foreign mode creates an orphan payment row
+	       that doesn't exist in the current profile's opening balance,
+	       blocking reconciliation.
+
+	Remapping strategy:
+	    Modes are matched by their Mode of Payment *type* field:
+	    - Cash -> Cash  (e.g. "Cash lebanon" -> "Boulaq Cash")
+	    - Bank -> Bank  (e.g. "Lebanon Visa" -> "Visa")
+	    - General -> first available in profile, or cash fallback
+
+	    This ensures the GL account matches the physical cash drawer or
+	    bank account at the branch where the return is processed.
+
+	Fallback chain for default mode:
+	    1. POS Profile.posa_cash_mode_of_payment (explicit cash mode config)
+	    2. First mode with type "Cash" in the profile
+	    3. First mode in the profile (any type)
+
+	When remapping is skipped (no-op):
+	    - Same profile (current == original)
+	    - No current_profile provided
+	    - All original modes already exist in the current profile
+	    - No default_mode could be determined (empty profile)
+
+	Args:
+	    payments_data: list of frappe._dict with mode_of_payment, amount, etc.
+	                   (from Sales Invoice Payment child table of original invoice)
+	    current_profile: POS Profile name where the return is being processed
+	    original_profile: POS Profile name where the original sale happened
+
+	Returns:
+	    The same payments_data list with mode_of_payment remapped in-place.
+	    Shared modes (e.g. "Visa" exists in both profiles) are left unchanged.
+
+	Example:
+	    Original invoice (profile "2- Lebanon"):
+	        payments = [{"mode_of_payment": "Cash lebanon", "amount": 3240}]
+
+	    Current profile "4- Boulaq" has modes:
+	        [{"mode_of_payment": "Boulaq Cash", type: "Cash"},
+	         {"mode_of_payment": "Visa",        type: "Bank"}]
+
+	    After remap:
+	        payments = [{"mode_of_payment": "Boulaq Cash", "amount": 3240}]
+
+	    "Cash lebanon" (type=Cash) -> "Boulaq Cash" (type=Cash)
+	"""
+	if not current_profile or current_profile == original_profile:
+		return payments_data
+
+	# Get current profile's payment modes
+	current_modes = {
+		row.mode_of_payment
+		for row in frappe.get_all(
+			"POS Payment Method",
+			filters={"parent": current_profile, "parenttype": "POS Profile"},
+			fields=["mode_of_payment"],
+		)
+	}
+
+	# Check if any payment needs remapping
+	needs_remap = any(p.mode_of_payment not in current_modes for p in payments_data)
+	if not needs_remap:
+		return payments_data
+
+	# Build type->mode map for the current profile.
+	# Uses setdefault so the first mode of each type wins (matches profile order).
+	mop = frappe.qb.DocType("Mode of Payment")
+	ppm = frappe.qb.DocType("POS Payment Method")
+	current_type_map = {}
+	rows = (
+		frappe.qb.from_(ppm)
+		.inner_join(mop)
+		.on(mop.name == ppm.mode_of_payment)
+		.select(ppm.mode_of_payment, mop.type)
+		.where((ppm.parent == current_profile) & (ppm.parenttype == "POS Profile"))
+	).run(as_dict=True)
+
+	for row in rows:
+		current_type_map.setdefault(row.type, row.mode_of_payment)
+
+	# Default fallback: posa_cash_mode_of_payment > first Cash type > first mode
+	default_mode = (
+		frappe.db.get_value("POS Profile", current_profile, "posa_cash_mode_of_payment")
+		or current_type_map.get("Cash")
+		or (rows[0].mode_of_payment if rows else None)
+	)
+
+	if not default_mode:
+		return payments_data
+
+	# Fetch the type for each foreign mode in a single query
+	foreign_modes = [p.mode_of_payment for p in payments_data if p.mode_of_payment not in current_modes]
+	foreign_types = {}
+	if foreign_modes:
+		type_rows = frappe.get_all(
+			"Mode of Payment",
+			filters={"name": ["in", foreign_modes]},
+			fields=["name", "type"],
+		)
+		foreign_types = {r.name: r.type for r in type_rows}
+
+	# Remap: foreign Cash -> current Cash, foreign Bank -> current Bank, etc.
+	# If no type match in current profile, fall back to default_mode.
+	for payment in payments_data:
+		if payment.mode_of_payment in current_modes:
+			continue
+		foreign_type = foreign_types.get(payment.mode_of_payment)
+		payment.mode_of_payment = current_type_map.get(foreign_type, default_mode)
+
+	return payments_data
 
 
 @frappe.whitelist()
 def prepare_return_invoice(invoice_name, pos_opening_shift=None):
-    """Prepare a return invoice using ERPNext's make_sales_return.
-
-    This uses ERPNext's standard return document creation which properly copies
-    all child tables including:
-    - sales_team: For correct commission reversal on returned items
-    - taxes: For correct tax reversal
-    - Other child tables maintained by ERPNext
-
-    The function validates:
-    - Invoice exists and is submitted (docstatus = 1)
-    - Invoice is not already a return
-    - Return is within the validity period (if configured in POS Settings)
-
-    Args:
-        invoice_name: The original Sales Invoice name to create return against
-        pos_opening_shift: The current POS Opening Shift name
-
-    Returns:
-        dict: The prepared return invoice document with:
-            - items: Only items with remaining_qty > 0 (not fully returned)
-            - _original_invoice: Reference data from original invoice (payments, amounts)
-            - Each item includes original_qty, already_returned, and remaining_qty
-    """
-    from frappe.utils import date_diff, getdate
-    from frappe.query_builder.functions import Sum, Abs, Coalesce
-    from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
-
-    # Validate invoice and get fields needed for return period check
-    si = frappe.qb.DocType("Sales Invoice")
-    invoice_check = (
-        frappe.qb.from_(si)
-        .select(
-            si.docstatus,
-            si.is_return,
-            si.pos_profile,
-            si.posting_date,
-            si.is_pos,
-            si.grand_total,
-            si.paid_amount,
-            si.outstanding_amount,
-            si.customer,
-            si.customer_name,
-            si.net_total,
-            si.total_taxes_and_charges
-        )
-        .where(si.name == invoice_name)
-    ).run(as_dict=True)
-
-    if not invoice_check:
-        frappe.throw(_("Invoice {0} does not exist").format(invoice_name))
-
-    invoice_info = invoice_check[0]
-
-    # Validate docstatus
-    if invoice_info.docstatus != 1:
-        frappe.throw(_("Invoice must be submitted to create a return"))
-
-    # Check if it's already a return
-    if invoice_info.is_return:
-        frappe.throw(_("Cannot create return against a return invoice"))
-
-    # Check return validity period from POS Settings
-    if invoice_info.pos_profile:
-        return_validity_days = cint(
-            frappe.db.get_value(
-                "POS Settings",
-                {"pos_profile": invoice_info.pos_profile},
-                "return_validity_days"
-            ) or 0
-        )
-
-        if return_validity_days > 0:
-            days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
-            if days_since_invoice > return_validity_days:
-                frappe.throw(
-                    _("Return period has expired. Invoice {0} was created {1} days ago. "
-                      "Returns are only allowed within {2} days of purchase.").format(
-                        invoice_name, days_since_invoice, return_validity_days
-                    )
-                )
-
-    # Use ERPNext's make_sales_return to create properly mapped return document
-    # This automatically copies sales_team, taxes, and other child tables
-    return_doc = make_sales_return(invoice_name)
-
-    # Set POS-specific fields
-    if pos_opening_shift:
-        return_doc.posa_pos_opening_shift = pos_opening_shift
-
-    # Ensure POS flags are set
-    return_doc.is_pos = invoice_info.is_pos
-    return_doc.pos_profile = invoice_info.pos_profile
-
-    # Aggregate quantities already returned from previous return invoices
-    ret_si = frappe.qb.DocType("Sales Invoice")
-    ret_item = frappe.qb.DocType("Sales Invoice Item")
-
-    returned_qty_results = (
-        frappe.qb.from_(ret_si)
-        .inner_join(ret_item).on(ret_item.parent == ret_si.name)
-        .select(
-            Coalesce(ret_item.sales_invoice_item, ret_item.item_code).as_("key_field"),
-            Sum(Abs(ret_item.qty)).as_("returned_qty")
-        )
-        .where(
-            (ret_si.return_against == invoice_name)
-            & (ret_si.docstatus == 1)
-            & (ret_si.is_return == 1)
-        )
-        .groupby(Coalesce(ret_item.sales_invoice_item, ret_item.item_code))
-    ).run(as_dict=True)
-
-    returned_qty_map = {row["key_field"]: flt(row["returned_qty"]) for row in returned_qty_results}
-
-    # Convert to dict and update items with remaining quantities
-    return_dict = return_doc.as_dict()
-
-    # Fetch original invoice payments for refund handling in frontend
-    si_payment = frappe.qb.DocType("Sales Invoice Payment")
-    payments_data = (
-        frappe.qb.from_(si_payment)
-        .select(
-            si_payment.mode_of_payment,
-            si_payment.amount,
-            si_payment.base_amount,
-            si_payment.account
-        )
-        .where(si_payment.parent == invoice_name)
-    ).run(as_dict=True)
-
-    # Cross-branch return: remap foreign payment modes to the current profile.
-    #
-    # When the original invoice's POS profile differs from the current shift's
-    # profile, the original payment modes (e.g. "Cash lebanon") won't exist in
-    # the current profile ("4- Boulaq"). _remap_foreign_payment_modes matches
-    # by Mode of Payment type (Cash->Cash, Bank->Bank) so the frontend
-    # pre-fills the correct refund method and the resulting GL entries debit
-    # the correct branch cash/bank account.
-    #
-    # This is the primary fix point (Layer 1). The frontend and closing shift
-    # code have additional safety nets for cases where this remap doesn't run
-    # (e.g. no pos_opening_shift provided) or for already-submitted invoices
-    # with the wrong payment mode.
-    if pos_opening_shift:
-        current_profile = frappe.db.get_value(
-            "POS Opening Shift", pos_opening_shift, "pos_profile"
-        )
-        if current_profile:
-            payments_data = _remap_foreign_payment_modes(
-                payments_data, current_profile, invoice_info.pos_profile
-            )
-
-    # Include original invoice data for reference (payments, amounts, etc.)
-    return_dict["_original_invoice"] = {
-        "name": invoice_name,
-        "grand_total": invoice_info.grand_total,
-        "paid_amount": invoice_info.paid_amount,
-        "outstanding_amount": invoice_info.outstanding_amount,
-        "customer": invoice_info.customer,
-        "customer_name": invoice_info.customer_name,
-        "posting_date": invoice_info.posting_date,
-        "payments": payments_data,
-        "net_total": invoice_info.net_total,
-        "total_taxes_and_charges": invoice_info.total_taxes_and_charges,
-    }
-
-    item_tax_map = _build_item_tax_map(return_dict.get("taxes", []))
-
-    # Check if taxes are inclusive by inspecting the tax rows copied from the original
-    # invoice (immutable after submission, unlike POS Settings which can change later).
-    # Only consider percentage-based taxes (On Net Total, etc.) — Actual charge types
-    # are never inclusive (same logic as sales_invoice_hooks.apply_tax_inclusive).
-    applicable_taxes = [
-        tax for tax in return_dict.get("taxes", [])
-        if tax.get("charge_type") != "Actual"
-    ]
-    tax_inclusive = bool(applicable_taxes) and all(
-        tax.get("included_in_print_rate") for tax in applicable_taxes
-    )
-
-    precision = cint(frappe.get_cached_value("System Settings", None, "currency_precision")) or 2
-
-    def process_return_item(item):
-        """Process single item for return, returns None if not returnable."""
-        item_ref = item.get("sales_invoice_item") or item.get("item_code")
-        original_qty = abs(flt(item.get("qty", 0)))
-        remaining_qty = original_qty - returned_qty_map.get(item_ref, 0)
-
-        if remaining_qty <= 0:
-            return None
-
-        # Get rate breakdown for display
-        price_list_rate = flt(item.get("price_list_rate") or item.get("rate"), precision)
-        net_rate = flt(item.get("net_rate") or item.get("rate"), precision)
-        tax_per_unit = flt(item_tax_map.get(item.get("item_code"), 0) / original_qty, precision) if original_qty else 0
-
-        # For inclusive taxes, use the original rate (already includes tax) to prevent
-        # ERPNext from back-calculating and double-reducing the tax.
-        # For exclusive taxes, use net_rate as before.
-        if tax_inclusive:
-            item_rate = flt(item.get("rate"), precision)
-            rate_with_tax = item_rate
-            # Both price_list_rate and rate are tax-inclusive, so discount is their difference
-            discount_per_unit = flt(price_list_rate - item_rate, precision)
-        else:
-            item_rate = net_rate
-            rate_with_tax = flt(net_rate + tax_per_unit, precision)
-            discount_per_unit = flt(price_list_rate - net_rate, precision)
-
-        return {
-            **item,
-            "original_qty": original_qty,
-            "already_returned": original_qty - remaining_qty,
-            "remaining_qty": remaining_qty,
-            "qty": -remaining_qty,
-            "price_list_rate": price_list_rate,
-            "rate": item_rate,
-            "discount_per_unit": discount_per_unit,
-            "amount": flt(item_rate * -remaining_qty, precision),
-            "tax_per_unit": tax_per_unit,
-            "rate_with_tax": rate_with_tax,
-            "tax_included_in_rate": tax_inclusive,
-        }
-
-    return_dict["items"] = [
-        processed for item in return_dict.get("items", [])
-        if (processed := process_return_item(item)) is not None
-    ]
-
-    # Check if all items have been fully returned
-    if not return_dict["items"]:
-        frappe.throw(_("All items from this invoice have already been returned"))
-
-    return return_dict
+	"""Prepare a return invoice using ERPNext's make_sales_return.
+
+	This uses ERPNext's standard return document creation which properly copies
+	all child tables including:
+	- sales_team: For correct commission reversal on returned items
+	- taxes: For correct tax reversal
+	- Other child tables maintained by ERPNext
+
+	The function validates:
+	- Invoice exists and is submitted (docstatus = 1)
+	- Invoice is not already a return
+	- Return is within the validity period (if configured in POS Settings)
+
+	Args:
+	    invoice_name: The original Sales Invoice name to create return against
+	    pos_opening_shift: The current POS Opening Shift name
+
+	Returns:
+	    dict: The prepared return invoice document with:
+	        - items: Only items with remaining_qty > 0 (not fully returned)
+	        - _original_invoice: Reference data from original invoice (payments, amounts)
+	        - Each item includes original_qty, already_returned, and remaining_qty
+	"""
+	from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
+	from frappe.query_builder.functions import Abs, Coalesce, Sum
+	from frappe.utils import date_diff, getdate
+
+	# Validate invoice and get fields needed for return period check
+	si = frappe.qb.DocType("Sales Invoice")
+	invoice_check = (
+		frappe.qb.from_(si)
+		.select(
+			si.docstatus,
+			si.is_return,
+			si.pos_profile,
+			si.posting_date,
+			si.is_pos,
+			si.grand_total,
+			si.paid_amount,
+			si.outstanding_amount,
+			si.customer,
+			si.customer_name,
+			si.net_total,
+			si.total_taxes_and_charges,
+		)
+		.where(si.name == invoice_name)
+	).run(as_dict=True)
+
+	if not invoice_check:
+		frappe.throw(_("Invoice {0} does not exist").format(invoice_name))
+
+	invoice_info = invoice_check[0]
+
+	# Validate docstatus
+	if invoice_info.docstatus != 1:
+		frappe.throw(_("Invoice must be submitted to create a return"))
+
+	# Check if it's already a return
+	if invoice_info.is_return:
+		frappe.throw(_("Cannot create return against a return invoice"))
+
+	# Check return validity period from POS Settings
+	if invoice_info.pos_profile:
+		return_validity_days = cint(
+			frappe.db.get_value(
+				"POS Next Settings", {"pos_profile": invoice_info.pos_profile}, "return_validity_days"
+			)
+			or 0
+		)
+
+		if return_validity_days > 0:
+			days_since_invoice = date_diff(getdate(nowdate()), getdate(invoice_info.posting_date))
+			if days_since_invoice > return_validity_days:
+				frappe.throw(
+					_(
+						"Return period has expired. Invoice {0} was created {1} days ago. "
+						"Returns are only allowed within {2} days of purchase."
+					).format(invoice_name, days_since_invoice, return_validity_days)
+				)
+
+	# Use ERPNext's make_sales_return to create properly mapped return document
+	# This automatically copies sales_team, taxes, and other child tables
+	return_doc = make_sales_return(invoice_name)
+
+	# Set POS-specific fields
+	if pos_opening_shift:
+		return_doc.posa_pos_opening_shift = pos_opening_shift
+
+	# Ensure POS flags are set
+	return_doc.is_pos = invoice_info.is_pos
+	return_doc.pos_profile = invoice_info.pos_profile
+
+	# Aggregate quantities already returned from previous return invoices
+	ret_si = frappe.qb.DocType("Sales Invoice")
+	ret_item = frappe.qb.DocType("Sales Invoice Item")
+
+	returned_qty_results = (
+		frappe.qb.from_(ret_si)
+		.inner_join(ret_item)
+		.on(ret_item.parent == ret_si.name)
+		.select(
+			Coalesce(ret_item.sales_invoice_item, ret_item.item_code).as_("key_field"),
+			Sum(Abs(ret_item.qty)).as_("returned_qty"),
+		)
+		.where((ret_si.return_against == invoice_name) & (ret_si.docstatus == 1) & (ret_si.is_return == 1))
+		.groupby(Coalesce(ret_item.sales_invoice_item, ret_item.item_code))
+	).run(as_dict=True)
+
+	returned_qty_map = {row["key_field"]: flt(row["returned_qty"]) for row in returned_qty_results}
+
+	# Convert to dict and update items with remaining quantities
+	return_dict = return_doc.as_dict()
+
+	# Fetch original invoice payments for refund handling in frontend
+	si_payment = frappe.qb.DocType("Sales Invoice Payment")
+	payments_data = (
+		frappe.qb.from_(si_payment)
+		.select(si_payment.mode_of_payment, si_payment.amount, si_payment.base_amount, si_payment.account)
+		.where(si_payment.parent == invoice_name)
+	).run(as_dict=True)
+
+	# Cross-branch return: remap foreign payment modes to the current profile.
+	#
+	# When the original invoice's POS profile differs from the current shift's
+	# profile, the original payment modes (e.g. "Cash lebanon") won't exist in
+	# the current profile ("4- Boulaq"). _remap_foreign_payment_modes matches
+	# by Mode of Payment type (Cash->Cash, Bank->Bank) so the frontend
+	# pre-fills the correct refund method and the resulting GL entries debit
+	# the correct branch cash/bank account.
+	#
+	# This is the primary fix point (Layer 1). The frontend and closing shift
+	# code have additional safety nets for cases where this remap doesn't run
+	# (e.g. no pos_opening_shift provided) or for already-submitted invoices
+	# with the wrong payment mode.
+	if pos_opening_shift:
+		current_profile = frappe.db.get_value("POS Opening Shift", pos_opening_shift, "pos_profile")
+		if current_profile:
+			payments_data = _remap_foreign_payment_modes(
+				payments_data, current_profile, invoice_info.pos_profile
+			)
+
+	# Include original invoice data for reference (payments, amounts, etc.)
+	return_dict["_original_invoice"] = {
+		"name": invoice_name,
+		"grand_total": invoice_info.grand_total,
+		"paid_amount": invoice_info.paid_amount,
+		"outstanding_amount": invoice_info.outstanding_amount,
+		"customer": invoice_info.customer,
+		"customer_name": invoice_info.customer_name,
+		"posting_date": invoice_info.posting_date,
+		"payments": payments_data,
+		"net_total": invoice_info.net_total,
+		"total_taxes_and_charges": invoice_info.total_taxes_and_charges,
+	}
+
+	item_tax_map = _build_item_tax_map(return_dict.get("taxes", []))
+
+	# Check if taxes are inclusive by inspecting the tax rows copied from the original
+	# invoice (immutable after submission, unlike POS Settings which can change later).
+	# Only consider percentage-based taxes (On Net Total, etc.) — Actual charge types
+	# are never inclusive (same logic as sales_invoice_hooks.apply_tax_inclusive).
+	applicable_taxes = [tax for tax in return_dict.get("taxes", []) if tax.get("charge_type") != "Actual"]
+	tax_inclusive = bool(applicable_taxes) and all(
+		tax.get("included_in_print_rate") for tax in applicable_taxes
+	)
+
+	precision = cint(frappe.get_cached_value("System Settings", None, "currency_precision")) or 2
+
+	def process_return_item(item):
+		"""Process single item for return, returns None if not returnable."""
+		item_ref = item.get("sales_invoice_item") or item.get("item_code")
+		original_qty = abs(flt(item.get("qty", 0)))
+		remaining_qty = original_qty - returned_qty_map.get(item_ref, 0)
+
+		if remaining_qty <= 0:
+			return None
+
+		# Get rate breakdown for display
+		price_list_rate = flt(item.get("price_list_rate") or item.get("rate"), precision)
+		net_rate = flt(item.get("net_rate") or item.get("rate"), precision)
+		tax_per_unit = (
+			flt(item_tax_map.get(item.get("item_code"), 0) / original_qty, precision) if original_qty else 0
+		)
+
+		# For inclusive taxes, use the original rate (already includes tax) to prevent
+		# ERPNext from back-calculating and double-reducing the tax.
+		# For exclusive taxes, use net_rate as before.
+		if tax_inclusive:
+			item_rate = flt(item.get("rate"), precision)
+			rate_with_tax = item_rate
+			# Both price_list_rate and rate are tax-inclusive, so discount is their difference
+			discount_per_unit = flt(price_list_rate - item_rate, precision)
+		else:
+			item_rate = net_rate
+			rate_with_tax = flt(net_rate + tax_per_unit, precision)
+			discount_per_unit = flt(price_list_rate - net_rate, precision)
+
+		return {
+			**item,
+			"original_qty": original_qty,
+			"already_returned": original_qty - remaining_qty,
+			"remaining_qty": remaining_qty,
+			"qty": -remaining_qty,
+			"price_list_rate": price_list_rate,
+			"rate": item_rate,
+			"discount_per_unit": discount_per_unit,
+			"amount": flt(item_rate * -remaining_qty, precision),
+			"tax_per_unit": tax_per_unit,
+			"rate_with_tax": rate_with_tax,
+			"tax_included_in_rate": tax_inclusive,
+		}
+
+	return_dict["items"] = [
+		processed
+		for item in return_dict.get("items", [])
+		if (processed := process_return_item(item)) is not None
+	]
+
+	# Check if all items have been fully returned
+	if not return_dict["items"]:
+		frappe.throw(_("All items from this invoice have already been returned"))
+
+	return return_dict
 
 
 @frappe.whitelist()
 def search_invoices_for_return(
-    invoice_name=None,
-    company=None,
-    customer_name=None,
-    customer_id=None,
-    mobile_no=None,
-    from_date=None,
-    to_date=None,
-    min_amount=None,
-    max_amount=None,
-    page=1,
-    doctype="Sales Invoice",
+	invoice_name=None,
+	company=None,
+	customer_name=None,
+	customer_id=None,
+	mobile_no=None,
+	from_date=None,
+	to_date=None,
+	min_amount=None,
+	max_amount=None,
+	page=1,
+	doctype="Sales Invoice",
 ):
-    """Search for invoices that can be returned with pagination.
-
-    Supports filtering by:
-    - invoice_name: Partial match on invoice number
-    - company: Exact match
-    - customer_name, customer_id, mobile_no: Partial match (OR condition)
-    - from_date, to_date: Date range
-    - min_amount, max_amount: Amount range
-
-    Returns invoices with their items adjusted to show remaining returnable quantities.
-    """
-    from frappe.query_builder.functions import Sum, Abs, Count
-
-    page = cint(page) or 1
-    page_length = 100
-    start = (page - 1) * page_length
-
-    # Build main invoice query
-    si = frappe.qb.DocType(doctype)
-
-    # Start building the query
-    query = (
-        frappe.qb.from_(si)
-        .select(
-            si.name,
-            si.customer,
-            si.customer_name,
-            si.posting_date,
-            si.grand_total,
-            si.status
-        )
-        .where(
-            (si.docstatus == 1)
-            & (si.is_return == 0)
-        )
-        .orderby(si.posting_date, order=frappe.qb.desc)
-        .orderby(si.name, order=frappe.qb.desc)
-        .limit(page_length)
-        .offset(start)
-    )
-
-    # Add company filter
-    if company:
-        query = query.where(si.company == company)
-
-    # Add invoice name filter
-    if invoice_name:
-        query = query.where(si.name.like(f"%{invoice_name}%"))
-
-    # Add date range filters
-    if from_date and to_date:
-        query = query.where(si.posting_date.between(from_date, to_date))
-    elif from_date:
-        query = query.where(si.posting_date >= from_date)
-    elif to_date:
-        query = query.where(si.posting_date <= to_date)
-
-    # Add amount filters
-    if min_amount and max_amount:
-        query = query.where(si.grand_total.between(float(min_amount), float(max_amount)))
-    elif min_amount:
-        query = query.where(si.grand_total >= float(min_amount))
-    elif max_amount:
-        query = query.where(si.grand_total <= float(max_amount))
-
-    # Search customers matching any of the provided criteria (OR logic)
-    if customer_name or customer_id or mobile_no:
-        cust = frappe.qb.DocType("Customer")
-        cust_query = frappe.qb.from_(cust).select(cust.name).limit(100)
-
-        # Build OR conditions for customer search
-        cust_conditions = []
-        if customer_name:
-            cust_conditions.append(cust.customer_name.like(f"%{customer_name}%"))
-        if customer_id:
-            cust_conditions.append(cust.name.like(f"%{customer_id}%"))
-        if mobile_no:
-            cust_conditions.append(cust.mobile_no.like(f"%{mobile_no}%"))
-
-        # Combine with OR
-        if cust_conditions:
-            combined_condition = cust_conditions[0]
-            for cond in cust_conditions[1:]:
-                combined_condition = combined_condition | cond
-            cust_query = cust_query.where(combined_condition)
-
-        customers = cust_query.run(as_dict=True)
-        customer_ids = [c.name for c in customers]
-
-        if customer_ids:
-            query = query.where(si.customer.isin(customer_ids))
-        else:
-            return {"invoices": [], "has_more": False}
-
-    # Execute main query
-    invoices_list = query.run(as_dict=True)
-
-    if not invoices_list:
-        return {"invoices": [], "has_more": False}
-
-    invoice_names = [inv["name"] for inv in invoices_list]
-
-    # Count total matching invoices for pagination
-    count_query = (
-        frappe.qb.from_(si)
-        .select(Count(si.name).as_("total"))
-        .where(
-            (si.docstatus == 1)
-            & (si.is_return == 0)
-        )
-    )
-
-    # Re-apply the same filters for count
-    if company:
-        count_query = count_query.where(si.company == company)
-    if invoice_name:
-        count_query = count_query.where(si.name.like(f"%{invoice_name}%"))
-    if from_date and to_date:
-        count_query = count_query.where(si.posting_date.between(from_date, to_date))
-    elif from_date:
-        count_query = count_query.where(si.posting_date >= from_date)
-    elif to_date:
-        count_query = count_query.where(si.posting_date <= to_date)
-    if min_amount and max_amount:
-        count_query = count_query.where(si.grand_total.between(float(min_amount), float(max_amount)))
-    elif min_amount:
-        count_query = count_query.where(si.grand_total >= float(min_amount))
-    elif max_amount:
-        count_query = count_query.where(si.grand_total <= float(max_amount))
-    if customer_name or customer_id or mobile_no:
-        if customer_ids:
-            count_query = count_query.where(si.customer.isin(customer_ids))
-
-    count_result = count_query.run(as_dict=True)
-    total_count = count_result[0].total if count_result else 0
-
-    # Batch fetch returned quantities for all invoices in current page
-    ret_si = frappe.qb.DocType(doctype)
-    ret_item = frappe.qb.DocType(f"{doctype} Item")
-
-    returned_qty_results = (
-        frappe.qb.from_(ret_si)
-        .inner_join(ret_item).on(ret_item.parent == ret_si.name)
-        .select(
-            ret_si.return_against.as_("invoice_name"),
-            ret_item.item_code,
-            Sum(Abs(ret_item.qty)).as_("returned_qty")
-        )
-        .where(
-            (ret_si.return_against.isin(invoice_names))
-            & (ret_si.docstatus == 1)
-            & (ret_si.is_return == 1)
-        )
-        .groupby(ret_si.return_against, ret_item.item_code)
-    ).run(as_dict=True)
-
-    # Build a map of invoice_name -> {item_code: returned_qty}
-    returned_qty_map = {}
-    for row in returned_qty_results:
-        inv_name = row["invoice_name"]
-        if inv_name not in returned_qty_map:
-            returned_qty_map[inv_name] = {}
-        returned_qty_map[inv_name][row["item_code"]] = flt(row["returned_qty"])
-
-    # Batch fetch all items for invoices in current page
-    si_item = frappe.qb.DocType(f"{doctype} Item")
-    all_items = (
-        frappe.qb.from_(si_item)
-        .select(
-            si_item.parent,
-            si_item.name,
-            si_item.item_code,
-            si_item.item_name,
-            si_item.qty,
-            si_item.rate,
-            si_item.amount,
-            si_item.stock_qty,
-            si_item.uom,
-            si_item.warehouse
-        )
-        .where(si_item.parent.isin(invoice_names))
-        .orderby(si_item.idx)
-    ).run(as_dict=True)
-
-    # Group items by parent invoice
-    items_by_invoice = {}
-    for item in all_items:
-        parent = item["parent"]
-        if parent not in items_by_invoice:
-            items_by_invoice[parent] = []
-        items_by_invoice[parent].append(item)
-
-    # Process and return results
-    data = []
-    for invoice in invoices_list:
-        inv_name = invoice["name"]
-        returned_qty = returned_qty_map.get(inv_name, {})
-        items = items_by_invoice.get(inv_name, [])
-
-        # Calculate remaining quantities
-        filtered_items = []
-        for item in items:
-            already_returned = returned_qty.get(item["item_code"], 0)
-            remaining_qty = flt(item["qty"]) - already_returned
-
-            if remaining_qty > 0:
-                new_item = item.copy()
-                new_item["qty"] = remaining_qty
-                new_item["amount"] = remaining_qty * flt(item["rate"])
-                if item.get("stock_qty") and item.get("qty"):
-                    new_item["stock_qty"] = flt(item["stock_qty"]) / flt(item["qty"]) * remaining_qty
-                filtered_items.append(frappe._dict(new_item))
-
-        # Only include invoices with returnable items
-        if filtered_items or not returned_qty:
-            invoice_data = frappe._dict(invoice)
-            invoice_data["items"] = filtered_items if filtered_items else items
-            data.append(invoice_data)
-
-    # Check if there are more results
-    has_more = (start + page_length) < total_count
-
-    return {"invoices": data, "has_more": has_more}
+	"""Search for invoices that can be returned with pagination.
+
+	Supports filtering by:
+	- invoice_name: Partial match on invoice number
+	- company: Exact match
+	- customer_name, customer_id, mobile_no: Partial match (OR condition)
+	- from_date, to_date: Date range
+	- min_amount, max_amount: Amount range
+
+	Returns invoices with their items adjusted to show remaining returnable quantities.
+	"""
+	from frappe.query_builder.functions import Abs, Count, Sum
+
+	page = cint(page) or 1
+	page_length = 100
+	start = (page - 1) * page_length
+
+	# Build main invoice query
+	si = frappe.qb.DocType(doctype)
+
+	# Start building the query
+	query = (
+		frappe.qb.from_(si)
+		.select(si.name, si.customer, si.customer_name, si.posting_date, si.grand_total, si.status)
+		.where((si.docstatus == 1) & (si.is_return == 0))
+		.orderby(si.posting_date, order=frappe.qb.desc)
+		.orderby(si.name, order=frappe.qb.desc)
+		.limit(page_length)
+		.offset(start)
+	)
+
+	# Add company filter
+	if company:
+		query = query.where(si.company == company)
+
+	# Add invoice name filter
+	if invoice_name:
+		query = query.where(si.name.like(f"%{invoice_name}%"))
+
+	# Add date range filters
+	if from_date and to_date:
+		query = query.where(si.posting_date.between(from_date, to_date))
+	elif from_date:
+		query = query.where(si.posting_date >= from_date)
+	elif to_date:
+		query = query.where(si.posting_date <= to_date)
+
+	# Add amount filters
+	if min_amount and max_amount:
+		query = query.where(si.grand_total.between(float(min_amount), float(max_amount)))
+	elif min_amount:
+		query = query.where(si.grand_total >= float(min_amount))
+	elif max_amount:
+		query = query.where(si.grand_total <= float(max_amount))
+
+	# Search customers matching any of the provided criteria (OR logic)
+	if customer_name or customer_id or mobile_no:
+		cust = frappe.qb.DocType("Customer")
+		cust_query = frappe.qb.from_(cust).select(cust.name).limit(100)
+
+		# Build OR conditions for customer search
+		cust_conditions = []
+		if customer_name:
+			cust_conditions.append(cust.customer_name.like(f"%{customer_name}%"))
+		if customer_id:
+			cust_conditions.append(cust.name.like(f"%{customer_id}%"))
+		if mobile_no:
+			cust_conditions.append(cust.mobile_no.like(f"%{mobile_no}%"))
+
+		# Combine with OR
+		if cust_conditions:
+			combined_condition = cust_conditions[0]
+			for cond in cust_conditions[1:]:
+				combined_condition = combined_condition | cond
+			cust_query = cust_query.where(combined_condition)
+
+		customers = cust_query.run(as_dict=True)
+		customer_ids = [c.name for c in customers]
+
+		if customer_ids:
+			query = query.where(si.customer.isin(customer_ids))
+		else:
+			return {"invoices": [], "has_more": False}
+
+	# Execute main query
+	invoices_list = query.run(as_dict=True)
+
+	if not invoices_list:
+		return {"invoices": [], "has_more": False}
+
+	invoice_names = [inv["name"] for inv in invoices_list]
+
+	# Count total matching invoices for pagination
+	count_query = (
+		frappe.qb.from_(si)
+		.select(Count(si.name).as_("total"))
+		.where((si.docstatus == 1) & (si.is_return == 0))
+	)
+
+	# Re-apply the same filters for count
+	if company:
+		count_query = count_query.where(si.company == company)
+	if invoice_name:
+		count_query = count_query.where(si.name.like(f"%{invoice_name}%"))
+	if from_date and to_date:
+		count_query = count_query.where(si.posting_date.between(from_date, to_date))
+	elif from_date:
+		count_query = count_query.where(si.posting_date >= from_date)
+	elif to_date:
+		count_query = count_query.where(si.posting_date <= to_date)
+	if min_amount and max_amount:
+		count_query = count_query.where(si.grand_total.between(float(min_amount), float(max_amount)))
+	elif min_amount:
+		count_query = count_query.where(si.grand_total >= float(min_amount))
+	elif max_amount:
+		count_query = count_query.where(si.grand_total <= float(max_amount))
+	if customer_name or customer_id or mobile_no:
+		if customer_ids:
+			count_query = count_query.where(si.customer.isin(customer_ids))
+
+	count_result = count_query.run(as_dict=True)
+	total_count = count_result[0].total if count_result else 0
+
+	# Batch fetch returned quantities for all invoices in current page
+	ret_si = frappe.qb.DocType(doctype)
+	ret_item = frappe.qb.DocType(f"{doctype} Item")
+
+	returned_qty_results = (
+		frappe.qb.from_(ret_si)
+		.inner_join(ret_item)
+		.on(ret_item.parent == ret_si.name)
+		.select(
+			ret_si.return_against.as_("invoice_name"),
+			ret_item.item_code,
+			Sum(Abs(ret_item.qty)).as_("returned_qty"),
+		)
+		.where(
+			(ret_si.return_against.isin(invoice_names)) & (ret_si.docstatus == 1) & (ret_si.is_return == 1)
+		)
+		.groupby(ret_si.return_against, ret_item.item_code)
+	).run(as_dict=True)
+
+	# Build a map of invoice_name -> {item_code: returned_qty}
+	returned_qty_map = {}
+	for row in returned_qty_results:
+		inv_name = row["invoice_name"]
+		if inv_name not in returned_qty_map:
+			returned_qty_map[inv_name] = {}
+		returned_qty_map[inv_name][row["item_code"]] = flt(row["returned_qty"])
+
+	# Batch fetch all items for invoices in current page
+	si_item = frappe.qb.DocType(f"{doctype} Item")
+	all_items = (
+		frappe.qb.from_(si_item)
+		.select(
+			si_item.parent,
+			si_item.name,
+			si_item.item_code,
+			si_item.item_name,
+			si_item.qty,
+			si_item.rate,
+			si_item.amount,
+			si_item.stock_qty,
+			si_item.uom,
+			si_item.warehouse,
+		)
+		.where(si_item.parent.isin(invoice_names))
+		.orderby(si_item.idx)
+	).run(as_dict=True)
+
+	# Group items by parent invoice
+	items_by_invoice = {}
+	for item in all_items:
+		parent = item["parent"]
+		if parent not in items_by_invoice:
+			items_by_invoice[parent] = []
+		items_by_invoice[parent].append(item)
+
+	# Process and return results
+	data = []
+	for invoice in invoices_list:
+		inv_name = invoice["name"]
+		returned_qty = returned_qty_map.get(inv_name, {})
+		items = items_by_invoice.get(inv_name, [])
+
+		# Calculate remaining quantities
+		filtered_items = []
+		for item in items:
+			already_returned = returned_qty.get(item["item_code"], 0)
+			remaining_qty = flt(item["qty"]) - already_returned
+
+			if remaining_qty > 0:
+				new_item = item.copy()
+				new_item["qty"] = remaining_qty
+				new_item["amount"] = remaining_qty * flt(item["rate"])
+				if item.get("stock_qty") and item.get("qty"):
+					new_item["stock_qty"] = flt(item["stock_qty"]) / flt(item["qty"]) * remaining_qty
+				filtered_items.append(frappe._dict(new_item))
+
+		# Only include invoices with returnable items
+		if filtered_items or not returned_qty:
+			invoice_data = frappe._dict(invoice)
+			invoice_data["items"] = filtered_items if filtered_items else items
+			data.append(invoice_data)
+
+	# Check if there are more results
+	has_more = (start + page_length) < total_count
+
+	return {"invoices": data, "has_more": has_more}
 
 
 # ==========================================
@@ -2655,384 +2606,338 @@ def search_invoices_for_return(
 
 @frappe.whitelist()
 def apply_offers(invoice_data, selected_offers=None):
-    """Calculate and apply promotional offers using ERPNext Pricing Rules.
-
-    Args:
-            invoice_data (str | dict): Sales Invoice payload used for offer evaluation.
-            selected_offers (str | list | None): Optional collection of Pricing Rule names.
-                    When provided, results are filtered to only include these rules.
-                    ERPNext handles all conflict resolution based on priority.
-    """
-    try:
-        if isinstance(invoice_data, str):
-            invoice_data = json.loads(invoice_data or "{}")
-
-        invoice = frappe._dict(invoice_data or {})
-        items = invoice.get("items") or []
-
-        if isinstance(selected_offers, str):
-            try:
-                selected_offers = json.loads(selected_offers)
-            except ValueError:
-                selected_offers = [selected_offers]
-
-        if isinstance(selected_offers, (list, tuple, set)):
-            selected_offer_names = {
-                cstr(name) for name in selected_offers if cstr(name)
-            }
-        else:
-            selected_offer_names = set()
-
-        if not items:
-            return {"items": []}
-
-        if not invoice.get("pos_profile") or not erpnext_apply_pricing_rule:
-            # Either no POS profile supplied or ERPNext promotional engine unavailable
-            return {"items": items}
-
-        profile = frappe.get_cached_doc("POS Profile", invoice.get("pos_profile"))
-
-        # Respect POS Profile's ignore_pricing_rule setting
-        if profile.ignore_pricing_rule:
-            return {"items": items}
-
-        # Batch fetch all item details in a single query (reduces N queries to 1)
-        item_codes = list({item.get("item_code") for item in items if item.get("item_code")})
-        item_details_map = {}
-        if item_codes:
-            item_records = frappe.get_all(
-                "Item",
-                filters={"name": ["in", item_codes]},
-                fields=["name", "item_name", "item_group", "brand", "stock_uom"],
-            )
-            item_details_map = {r.name: r for r in item_records}
-
-        pricing_items = []
-        index_map = []
-        prepared_items = [frappe._dict(row) for row in items]
-
-        for idx, item in enumerate(prepared_items):
-            item_code = item.get("item_code")
-            qty = flt(item.get("qty") or item.get("quantity") or 0)
-
-            if not item_code or qty <= 0:
-                continue
-
-            # Use batch-fetched item details
-            cached = item_details_map.get(item_code)
-
-            conversion_factor = flt(item.get("conversion_factor") or 1) or 1
-            price_list_rate = flt(item.get("price_list_rate") or item.get("rate") or 0)
-
-            pricing_items.append(
-                frappe._dict(
-                    {
-                        "doctype": "Sales Invoice Item",
-                        "name": item.get("name") or f"POS-{idx}",
-                        "item_code": item_code,
-                        "item_name": (
-                            cached.item_name if cached else item.get("item_name")
-                        ),
-                        "item_group": (
-                            cached.item_group if cached else item.get("item_group")
-                        ),
-                        "brand": (cached.brand if cached else item.get("brand")),
-                        "qty": qty,
-                        "stock_qty": qty * conversion_factor,
-                        "conversion_factor": conversion_factor,
-                        "uom": item.get("uom")
-                        or item.get("stock_uom")
-                        or (cached.stock_uom if cached else None),
-                        "stock_uom": item.get("stock_uom")
-                        or (cached.stock_uom if cached else None),
-                        "price_list_rate": price_list_rate,
-                        "base_price_list_rate": price_list_rate,
-                        "rate": flt(item.get("rate") or price_list_rate),
-                        "base_rate": flt(item.get("rate") or price_list_rate),
-                        "discount_percentage": 0,
-                        "discount_amount": 0,
-                        "warehouse": item.get("warehouse") or profile.warehouse,
-                        "parenttype": invoice.get("doctype") or "Sales Invoice",
-                    }
-                )
-            )
-            index_map.append(idx)
-
-            # Clear previously applied promotional metadata if the
-            # current quantity can no longer satisfy the rule.
-            item.discount_percentage = 0
-            item.discount_amount = 0
-            item.pricing_rules = []
-            item.applied_promotional_schemes = []
-
-        if not pricing_items:
-            return {"items": items}
-
-        company_currency = frappe.get_cached_value(
-            "Company", profile.company, "default_currency"
-        )
-
-        # Get customer details if customer is provided
-        customer = invoice.get("customer")
-        customer_group = invoice.get("customer_group")
-        territory = invoice.get("territory")
-
-        if customer and not customer_group:
-            # Fetch customer_group from customer
-            try:
-                customer_data = frappe.get_cached_value(
-                    "Customer", customer, ["customer_group", "territory"], as_dict=1
-                )
-                if customer_data:
-                    customer_group = customer_data.get("customer_group")
-                    if not territory:
-                        territory = customer_data.get("territory")
-            except Exception as e:
-                # Customer lookup failed, will use defaults
-                frappe.log_error(
-                    f"Failed to fetch customer data for {customer}: {e}",
-                    "Customer Data Lookup"
-                )
-
-        # If still no customer_group, use default
-        if not customer_group:
-            customer_group = "All Customer Groups"
-
-        pricing_args = frappe._dict(
-            {
-                "doctype": invoice.get("doctype") or "Sales Invoice",
-                "name": invoice.get("name") or "POS-INVOICE",
-                "is_pos": 1,
-                "company": profile.company,
-                "transaction_date": invoice.get("posting_date") or nowdate(),
-                "posting_date": invoice.get("posting_date") or nowdate(),
-                "currency": invoice.get("currency")
-                or profile.get("currency")
-                or company_currency,
-                "conversion_rate": flt(invoice.get("conversion_rate") or 1) or 1,
-                "plc_conversion_rate": flt(invoice.get("plc_conversion_rate") or 1)
-                or 1,
-                "price_list": invoice.get("price_list")
-                or profile.get("selling_price_list"),
-                "customer": customer,
-                "customer_group": customer_group,
-                "territory": territory,
-                "items": pricing_items,
-            }
-        )
-
-        # Call ERPNext pricing engine - it handles all conflicts based on priority
-        #
-        # Why we pass pricing_args twice:
-        # - 1st param (args): ERPNext extracts and pops 'items' from this, then processes each item individually
-        # - 2nd param (doc): Used by 'mixed_conditions' pricing rules to access the FULL items list
-        #                    for quantity accumulation across different items in the same group
-        #
-        # Example: A rule "Buy 2 from Demo Item Group, get 10% off" with mixed_conditions=1
-        # needs to see ALL items (1 Book + 1 Camera) to know total qty=2, not just each item's qty=1
-        #
-        # See: erpnext/accounts/doctype/pricing_rule/utils.py -> get_qty_and_rate_for_mixed_conditions()
-        pricing_results = erpnext_apply_pricing_rule(pricing_args, doc=pricing_args) or []
-
-        if not pricing_results:
-            return {"items": items}
-
-        raw_rule_names = set()
-        for result in pricing_results:
-            if not result:
-                continue
-            rules = []
-            if erpnext_get_applied_pricing_rules:
-                rules = erpnext_get_applied_pricing_rules(result.get("pricing_rules"))
-            else:
-                raw_rules = result.get("pricing_rules") or []
-                if isinstance(raw_rules, str):
-                    if raw_rules.startswith("["):
-                        rules = json.loads(raw_rules)
-                    else:
-                        rules = [r.strip() for r in raw_rules.split(",") if r.strip()]
-                elif isinstance(raw_rules, (list, tuple, set)):
-                    rules = list(raw_rules)
-            raw_rule_names.update(rules)
-
-        # Build a map of applicable pricing rules from the ERPNext engine results.
-        #
-        # ERPNext has two types of pricing rules:
-        #
-        # 1. Promotional Scheme Rules (promotional_scheme is set):
-        #    - Created automatically when a Promotional Scheme is saved
-        #    - The scheme acts as a "template" that generates one or more Pricing Rules
-        #    - Example: "Summer Sale" scheme creates "PRLE-0001", "PRLE-0002" rules
-        #
-        # 2. Standalone Pricing Rules (promotional_scheme is empty):
-        #    - Created directly as Pricing Rule documents
-        #    - Not linked to any Promotional Scheme
-        #    - Example: A direct "10% off Item X" rule created in Pricing Rule doctype
-        #
-        # We include BOTH types for POS, but exclude coupon_code_based rules
-        # (those require explicit coupon entry and are handled separately).
-        #
-        rule_map = {}
-        if raw_rule_names:
-            rule_records = frappe.get_all(
-                "Pricing Rule",
-                filters={"name": ["in", list(raw_rule_names)]},
-                fields=[
-                    "name",
-                    "promotional_scheme",
-                    "coupon_code_based",
-                    "promotional_scheme_id",
-                    "price_or_product_discount",
-                ],
-            )
-            for record in rule_records:
-                # Skip coupon-based rules (require explicit coupon code entry)
-                if record.coupon_code_based:
-                    continue
-
-                # Include both promotional scheme rules and standalone pricing rules
-                rule_map[record.name] = record
-
-        if selected_offer_names:
-            # Restrict available rules to the ones explicitly selected from the UI.
-            rule_map = {
-                name: details
-                for name, details in rule_map.items()
-                if name in selected_offer_names
-            }
-
-        if not rule_map:
-            return {"items": items}
-
-        applied_rules = set()
-        # Deduplicate free items using a dict keyed by (item_code, pricing_rule).
-        # ERPNext's apply_pricing_rule() returns one result per cart item and for
-        # mixed_conditions rules attaches the same free_item_data to every matching
-        # item's result. ERPNext's own apply_pricing_rule_for_free_items() deduplicates
-        # the same way: {(item_code, pricing_rules): data for data in free_item_data}.
-        free_items_map = {}
-
-        for result, item_index in zip(pricing_results, index_map):
-            if not result:
-                continue
-
-            if erpnext_get_applied_pricing_rules:
-                rule_names = erpnext_get_applied_pricing_rules(
-                    result.get("pricing_rules")
-                )
-            else:
-                raw_rules = result.get("pricing_rules") or []
-                if isinstance(raw_rules, str):
-                    if raw_rules.startswith("["):
-                        rule_names = json.loads(raw_rules)
-                    else:
-                        rule_names = [
-                            r.strip() for r in raw_rules.split(",") if r.strip()
-                        ]
-                elif isinstance(raw_rules, (list, tuple, set)):
-                    rule_names = list(raw_rules)
-                else:
-                    rule_names = []
-
-            applicable_rule_names = [
-                name for name in rule_names or [] if name in rule_map
-            ]
-
-            if not applicable_rule_names:
-                continue
-
-            applied_rules.update(applicable_rule_names)
-
-            item_doc = prepared_items[item_index]
-            qty = flt(item_doc.get("qty") or item_doc.get("quantity") or 0)
-            price_list_rate = flt(
-                result.get("price_list_rate")
-                or item_doc.get("price_list_rate")
-                or item_doc.get("rate")
-                or 0
-            )
-
-            # Get discount from result or fetch from pricing rule
-            discount_percentage = flt(result.get("discount_percentage") or 0)
-            per_unit_discount = flt(result.get("discount_amount") or 0)
-
-            # If ERPNext didn't calculate discount (validate_applied_rule=1),
-            # we need to fetch and apply it manually
-            if (
-                not discount_percentage
-                and not per_unit_discount
-                and applicable_rule_names
-            ):
-                for rule_name in applicable_rule_names:
-                    rule_doc = rule_map.get(rule_name)
-                    if not rule_doc:
-                        continue
-
-                    # Fetch full pricing rule to get discount values
-                    full_rule = frappe.get_cached_doc("Pricing Rule", rule_name)
-
-                    if (
-                        full_rule.rate_or_discount == "Discount Percentage"
-                        and full_rule.discount_percentage
-                    ):
-                        discount_percentage += flt(full_rule.discount_percentage)
-                    elif (
-                        full_rule.rate_or_discount == "Discount Amount"
-                        and full_rule.discount_amount
-                    ):
-                        per_unit_discount += flt(full_rule.discount_amount)
-                    elif full_rule.rate_or_discount == "Rate" and full_rule.rate:
-                        # Apply fixed rate
-                        price_list_rate = flt(full_rule.rate)
-
-            line_discount_amount = 0
-            if discount_percentage and qty and price_list_rate:
-                line_discount_amount = price_list_rate * qty * discount_percentage / 100
-            elif per_unit_discount and qty:
-                line_discount_amount = per_unit_discount * qty
-            else:
-                line_discount_amount = per_unit_discount
-
-            if (
-                not discount_percentage
-                and line_discount_amount
-                and qty
-                and price_list_rate
-            ):
-                base_amount = price_list_rate * qty
-                if base_amount:
-                    discount_percentage = (line_discount_amount / base_amount) * 100
-
-            item_doc.discount_percentage = discount_percentage
-            item_doc.discount_amount = line_discount_amount
-            item_doc.price_list_rate = price_list_rate
-            item_doc.rate = flt(item_doc.get("rate") or price_list_rate)
-            # ERPNext expects pricing_rules as comma-separated string, not a list
-            item_doc.pricing_rules = ",".join(applicable_rule_names) if applicable_rule_names else ""
-
-            item_doc.applied_promotional_schemes = list(
-                {
-                    rule_map[name].promotional_scheme
-                    for name in applicable_rule_names
-                    if rule_map[name].promotional_scheme
-                }
-            )
-
-            for free_item in result.get("free_item_data") or []:
-                rule_name = free_item.get("pricing_rules")
-                if not rule_name or rule_name not in rule_map:
-                    continue
-                free_item_doc = frappe._dict(free_item)
-                free_item_doc.applied_promotional_scheme = rule_map[
-                    rule_name
-                ].promotional_scheme
-                free_items_map[(free_item.get("item_code"), rule_name)] = free_item_doc
-
-        return {
-            "items": [dict(item) for item in prepared_items],
-            "free_items": [dict(item) for item in free_items_map.values()],
-            "applied_pricing_rules": sorted(applied_rules),
-        }
-    except Exception as e:
-        frappe.log_error(frappe.get_traceback(), "Apply Offers Error")
-        frappe.throw(_("Error applying offers: {0}").format(str(e)))
+	"""Calculate and apply promotional offers using ERPNext Pricing Rules.
+
+	Args:
+	        invoice_data (str | dict): Sales Invoice payload used for offer evaluation.
+	        selected_offers (str | list | None): Optional collection of Pricing Rule names.
+	                When provided, results are filtered to only include these rules.
+	                ERPNext handles all conflict resolution based on priority.
+	"""
+	try:
+		if isinstance(invoice_data, str):
+			invoice_data = json.loads(invoice_data or "{}")
+
+		invoice = frappe._dict(invoice_data or {})
+		items = invoice.get("items") or []
+
+		if isinstance(selected_offers, str):
+			try:
+				selected_offers = json.loads(selected_offers)
+			except ValueError:
+				selected_offers = [selected_offers]
+
+		if isinstance(selected_offers, list | tuple | set):
+			selected_offer_names = {cstr(name) for name in selected_offers if cstr(name)}
+		else:
+			selected_offer_names = set()
+
+		if not items:
+			return {"items": []}
+
+		if not invoice.get("pos_profile") or not erpnext_apply_pricing_rule:
+			# Either no POS profile supplied or ERPNext promotional engine unavailable
+			return {"items": items}
+
+		profile = frappe.get_cached_doc("POS Profile", invoice.get("pos_profile"))
+
+		# Respect POS Profile's ignore_pricing_rule setting
+		if profile.ignore_pricing_rule:
+			return {"items": items}
+
+		# Batch fetch all item details in a single query (reduces N queries to 1)
+		item_codes = list({item.get("item_code") for item in items if item.get("item_code")})
+		item_details_map = {}
+		if item_codes:
+			item_records = frappe.get_all(
+				"Item",
+				filters={"name": ["in", item_codes]},
+				fields=["name", "item_name", "item_group", "brand", "stock_uom"],
+			)
+			item_details_map = {r.name: r for r in item_records}
+
+		pricing_items = []
+		index_map = []
+		prepared_items = [frappe._dict(row) for row in items]
+
+		for idx, item in enumerate(prepared_items):
+			item_code = item.get("item_code")
+			qty = flt(item.get("qty") or item.get("quantity") or 0)
+
+			if not item_code or qty <= 0:
+				continue
+
+			# Use batch-fetched item details
+			cached = item_details_map.get(item_code)
+
+			conversion_factor = flt(item.get("conversion_factor") or 1) or 1
+			price_list_rate = flt(item.get("price_list_rate") or item.get("rate") or 0)
+
+			pricing_items.append(
+				frappe._dict(
+					{
+						"doctype": "Sales Invoice Item",
+						"name": item.get("name") or f"POS-{idx}",
+						"item_code": item_code,
+						"item_name": (cached.item_name if cached else item.get("item_name")),
+						"item_group": (cached.item_group if cached else item.get("item_group")),
+						"brand": (cached.brand if cached else item.get("brand")),
+						"qty": qty,
+						"stock_qty": qty * conversion_factor,
+						"conversion_factor": conversion_factor,
+						"uom": item.get("uom")
+						or item.get("stock_uom")
+						or (cached.stock_uom if cached else None),
+						"stock_uom": item.get("stock_uom") or (cached.stock_uom if cached else None),
+						"price_list_rate": price_list_rate,
+						"base_price_list_rate": price_list_rate,
+						"rate": flt(item.get("rate") or price_list_rate),
+						"base_rate": flt(item.get("rate") or price_list_rate),
+						"discount_percentage": 0,
+						"discount_amount": 0,
+						"warehouse": item.get("warehouse") or profile.warehouse,
+						"parenttype": invoice.get("doctype") or "Sales Invoice",
+					}
+				)
+			)
+			index_map.append(idx)
+
+			# Clear previously applied promotional metadata if the
+			# current quantity can no longer satisfy the rule.
+			item.discount_percentage = 0
+			item.discount_amount = 0
+			item.pricing_rules = []
+			item.applied_promotional_schemes = []
+
+		if not pricing_items:
+			return {"items": items}
+
+		company_currency = frappe.get_cached_value("Company", profile.company, "default_currency")
+
+		# Get customer details if customer is provided
+		customer = invoice.get("customer")
+		customer_group = invoice.get("customer_group")
+		territory = invoice.get("territory")
+
+		if customer and not customer_group:
+			# Fetch customer_group from customer
+			try:
+				customer_data = frappe.get_cached_value(
+					"Customer", customer, ["customer_group", "territory"], as_dict=1
+				)
+				if customer_data:
+					customer_group = customer_data.get("customer_group")
+					if not territory:
+						territory = customer_data.get("territory")
+			except Exception as e:
+				# Customer lookup failed, will use defaults
+				frappe.log_error(f"Failed to fetch customer data for {customer}: {e}", "Customer Data Lookup")
+
+		# If still no customer_group, use default
+		if not customer_group:
+			customer_group = "All Customer Groups"
+
+		pricing_args = frappe._dict(
+			{
+				"doctype": invoice.get("doctype") or "Sales Invoice",
+				"name": invoice.get("name") or "POS-INVOICE",
+				"is_pos": 1,
+				"company": profile.company,
+				"transaction_date": invoice.get("posting_date") or nowdate(),
+				"posting_date": invoice.get("posting_date") or nowdate(),
+				"currency": invoice.get("currency") or profile.get("currency") or company_currency,
+				"conversion_rate": flt(invoice.get("conversion_rate") or 1) or 1,
+				"plc_conversion_rate": flt(invoice.get("plc_conversion_rate") or 1) or 1,
+				"price_list": invoice.get("price_list") or profile.get("selling_price_list"),
+				"customer": customer,
+				"customer_group": customer_group,
+				"territory": territory,
+				"items": pricing_items,
+			}
+		)
+
+		# Call ERPNext pricing engine - it handles all conflicts based on priority
+		#
+		# Why we pass pricing_args twice:
+		# - 1st param (args): ERPNext extracts and pops 'items' from this, then processes each item individually
+		# - 2nd param (doc): Used by 'mixed_conditions' pricing rules to access the FULL items list
+		#                    for quantity accumulation across different items in the same group
+		#
+		# Example: A rule "Buy 2 from Demo Item Group, get 10% off" with mixed_conditions=1
+		# needs to see ALL items (1 Book + 1 Camera) to know total qty=2, not just each item's qty=1
+		#
+		# See: erpnext/accounts/doctype/pricing_rule/utils.py -> get_qty_and_rate_for_mixed_conditions()
+		pricing_results = erpnext_apply_pricing_rule(pricing_args, doc=pricing_args) or []
+
+		if not pricing_results:
+			return {"items": items}
+
+		raw_rule_names = set()
+		for result in pricing_results:
+			if not result:
+				continue
+			rules = []
+			if erpnext_get_applied_pricing_rules:
+				rules = erpnext_get_applied_pricing_rules(result.get("pricing_rules"))
+			else:
+				raw_rules = result.get("pricing_rules") or []
+				if isinstance(raw_rules, str):
+					if raw_rules.startswith("["):
+						rules = json.loads(raw_rules)
+					else:
+						rules = [r.strip() for r in raw_rules.split(",") if r.strip()]
+				elif isinstance(raw_rules, list | tuple | set):
+					rules = list(raw_rules)
+			raw_rule_names.update(rules)
+
+		# Build a map of applicable pricing rules from the ERPNext engine results.
+		#
+		# ERPNext has two types of pricing rules:
+		#
+		# 1. Promotional Scheme Rules (promotional_scheme is set):
+		#    - Created automatically when a Promotional Scheme is saved
+		#    - The scheme acts as a "template" that generates one or more Pricing Rules
+		#    - Example: "Summer Sale" scheme creates "PRLE-0001", "PRLE-0002" rules
+		#
+		# 2. Standalone Pricing Rules (promotional_scheme is empty):
+		#    - Created directly as Pricing Rule documents
+		#    - Not linked to any Promotional Scheme
+		#    - Example: A direct "10% off Item X" rule created in Pricing Rule doctype
+		#
+		# We include BOTH types for POS, but exclude coupon_code_based rules
+		# (those require explicit coupon entry and are handled separately).
+		#
+		rule_map = {}
+		if raw_rule_names:
+			rule_records = frappe.get_all(
+				"Pricing Rule",
+				filters={"name": ["in", list(raw_rule_names)]},
+				fields=[
+					"name",
+					"promotional_scheme",
+					"coupon_code_based",
+					"promotional_scheme_id",
+					"price_or_product_discount",
+				],
+			)
+			for record in rule_records:
+				# Skip coupon-based rules (require explicit coupon code entry)
+				if record.coupon_code_based:
+					continue
+
+				# Include both promotional scheme rules and standalone pricing rules
+				rule_map[record.name] = record
+
+		if selected_offer_names:
+			# Restrict available rules to the ones explicitly selected from the UI.
+			rule_map = {name: details for name, details in rule_map.items() if name in selected_offer_names}
+
+		if not rule_map:
+			return {"items": items}
+
+		applied_rules = set()
+		# Deduplicate free items using a dict keyed by (item_code, pricing_rule).
+		# ERPNext's apply_pricing_rule() returns one result per cart item and for
+		# mixed_conditions rules attaches the same free_item_data to every matching
+		# item's result. ERPNext's own apply_pricing_rule_for_free_items() deduplicates
+		# the same way: {(item_code, pricing_rules): data for data in free_item_data}.
+		free_items_map = {}
+
+		for result, item_index in zip(pricing_results, index_map, strict=False):
+			if not result:
+				continue
+
+			if erpnext_get_applied_pricing_rules:
+				rule_names = erpnext_get_applied_pricing_rules(result.get("pricing_rules"))
+			else:
+				raw_rules = result.get("pricing_rules") or []
+				if isinstance(raw_rules, str):
+					if raw_rules.startswith("["):
+						rule_names = json.loads(raw_rules)
+					else:
+						rule_names = [r.strip() for r in raw_rules.split(",") if r.strip()]
+				elif isinstance(raw_rules, list | tuple | set):
+					rule_names = list(raw_rules)
+				else:
+					rule_names = []
+
+			applicable_rule_names = [name for name in rule_names or [] if name in rule_map]
+
+			if not applicable_rule_names:
+				continue
+
+			applied_rules.update(applicable_rule_names)
+
+			item_doc = prepared_items[item_index]
+			qty = flt(item_doc.get("qty") or item_doc.get("quantity") or 0)
+			price_list_rate = flt(
+				result.get("price_list_rate") or item_doc.get("price_list_rate") or item_doc.get("rate") or 0
+			)
+
+			# Get discount from result or fetch from pricing rule
+			discount_percentage = flt(result.get("discount_percentage") or 0)
+			per_unit_discount = flt(result.get("discount_amount") or 0)
+
+			# If ERPNext didn't calculate discount (validate_applied_rule=1),
+			# we need to fetch and apply it manually
+			if not discount_percentage and not per_unit_discount and applicable_rule_names:
+				for rule_name in applicable_rule_names:
+					rule_doc = rule_map.get(rule_name)
+					if not rule_doc:
+						continue
+
+					# Fetch full pricing rule to get discount values
+					full_rule = frappe.get_cached_doc("Pricing Rule", rule_name)
+
+					if full_rule.rate_or_discount == "Discount Percentage" and full_rule.discount_percentage:
+						discount_percentage += flt(full_rule.discount_percentage)
+					elif full_rule.rate_or_discount == "Discount Amount" and full_rule.discount_amount:
+						per_unit_discount += flt(full_rule.discount_amount)
+					elif full_rule.rate_or_discount == "Rate" and full_rule.rate:
+						# Apply fixed rate
+						price_list_rate = flt(full_rule.rate)
+
+			line_discount_amount = 0
+			if discount_percentage and qty and price_list_rate:
+				line_discount_amount = price_list_rate * qty * discount_percentage / 100
+			elif per_unit_discount and qty:
+				line_discount_amount = per_unit_discount * qty
+			else:
+				line_discount_amount = per_unit_discount
+
+			if not discount_percentage and line_discount_amount and qty and price_list_rate:
+				base_amount = price_list_rate * qty
+				if base_amount:
+					discount_percentage = (line_discount_amount / base_amount) * 100
+
+			item_doc.discount_percentage = discount_percentage
+			item_doc.discount_amount = line_discount_amount
+			item_doc.price_list_rate = price_list_rate
+			item_doc.rate = flt(item_doc.get("rate") or price_list_rate)
+			# ERPNext expects pricing_rules as comma-separated string, not a list
+			item_doc.pricing_rules = ",".join(applicable_rule_names) if applicable_rule_names else ""
+
+			item_doc.applied_promotional_schemes = list(
+				{
+					rule_map[name].promotional_scheme
+					for name in applicable_rule_names
+					if rule_map[name].promotional_scheme
+				}
+			)
+
+			for free_item in result.get("free_item_data") or []:
+				rule_name = free_item.get("pricing_rules")
+				if not rule_name or rule_name not in rule_map:
+					continue
+				free_item_doc = frappe._dict(free_item)
+				free_item_doc.applied_promotional_scheme = rule_map[rule_name].promotional_scheme
+				free_items_map[(free_item.get("item_code"), rule_name)] = free_item_doc
+
+		return {
+			"items": [dict(item) for item in prepared_items],
+			"free_items": [dict(item) for item in free_items_map.values()],
+			"applied_pricing_rules": sorted(applied_rules),
+		}
+	except Exception as e:
+		frappe.log_error(frappe.get_traceback(), "Apply Offers Error")
+		frappe.throw(_("Error applying offers: {0}").format(str(e)))
diff --git a/pos_next/api/localization.py b/pos_next/api/localization.py
index d7d6d3ee..183fcd4c 100644
--- a/pos_next/api/localization.py
+++ b/pos_next/api/localization.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2024, POS Next and contributors
 # For license information, please see license.txt
 
@@ -38,10 +37,7 @@ def get_user_language():
 	# Get user's language preference
 	language = frappe.db.get_value("User", frappe.session.user, "language") or "en"
 
-	return {
-		"success": True,
-		"locale": language.lower()
-	}
+	return {"success": True, "locale": language.lower()}
 
 
 @frappe.whitelist()
@@ -53,10 +49,7 @@ def get_allowed_locales():
 		dict: List of allowed locale codes
 	"""
 	allowed = get_allowed_locales_from_settings()
-	return {
-		"success": True,
-		"locales": list(allowed)
-	}
+	return {"success": True, "locales": list(allowed)}
 
 
 def get_allowed_locales_from_settings():
@@ -67,21 +60,18 @@ def get_allowed_locales_from_settings():
 	Returns:
 		set: Set of allowed locale codes
 	"""
-	default_locales = {'ar', 'en'}
+	default_locales = {"ar", "en"}
 
 	try:
 		# Get the first POS Settings (or we could use a specific one based on user's profile)
 		pos_settings_list = frappe.get_all(
-			"POS Settings",
-			filters={"enabled": 1},
-			fields=["name"],
-			limit=1
+			"POS Next Settings", filters={"enabled": 1}, fields=["name"], limit=1
 		)
 
 		if not pos_settings_list:
 			return default_locales
 
-		pos_settings = frappe.get_doc("POS Settings", pos_settings_list[0].name)
+		pos_settings = frappe.get_doc("POS Next Settings", pos_settings_list[0].name)
 
 		if pos_settings.allowed_locales and len(pos_settings.allowed_locales) > 0:
 			return {row.language.lower() for row in pos_settings.allowed_locales}
@@ -130,11 +120,7 @@ def change_user_language(locale):
 		frappe.db.set_value("User", frappe.session.user, "language", locale)
 		frappe.db.commit()
 
-		return {
-			"success": True,
-			"message": f"Language changed to {locale}",
-			"locale": locale
-		}
+		return {"success": True, "message": f"Language changed to {locale}", "locale": locale}
 	except Exception as e:
-		frappe.log_error(f"Failed to change user language: {str(e)}")
-		frappe.throw(f"Failed to change language: {str(e)}", frappe.ValidationError)
+		frappe.log_error(f"Failed to change user language: {e!s}")
+		frappe.throw(f"Failed to change language: {e!s}", frappe.ValidationError)
diff --git a/pos_next/api/pos_profile.py b/pos_next/api/pos_profile.py
index c357ef9b..a0d77832 100644
--- a/pos_next/api/pos_profile.py
+++ b/pos_next/api/pos_profile.py
@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2024, POS Next and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
+
 import frappe
 from frappe import _
-from pos_next.api.utilities import check_user_company
-from pos_next.api.utilities import _parse_list_parameter
+
+from pos_next.api.utilities import _parse_list_parameter, check_user_company
 
 
 @frappe.whitelist()
@@ -35,10 +34,7 @@ def get_pos_profile_data(pos_profile):
 		frappe.throw(_("POS Profile is required"))
 
 	# Check if user has access to this POS Profile
-	has_access = frappe.db.exists(
-		"POS Profile User",
-		{"parent": pos_profile, "user": frappe.session.user}
-	)
+	has_access = frappe.db.exists("POS Profile User", {"parent": pos_profile, "user": frappe.session.user})
 
 	if not has_access:
 		frappe.throw(_("You don't have access to this POS Profile"))
@@ -52,6 +48,7 @@ def get_pos_profile_data(pos_profile):
 	# Get hierarchical item groups (with child_groups info) in same call
 	# This eliminates a separate API call to get_item_groups
 	from pos_next.api.items import get_item_groups
+
 	item_groups_with_hierarchy = get_item_groups(pos_profile)
 
 	return {
@@ -63,14 +60,14 @@ def get_pos_profile_data(pos_profile):
 			"auto_print": profile_doc.get("print_receipt_on_order_complete", 0),
 			"print_format": profile_doc.get("print_format"),
 			"letter_head": profile_doc.get("letter_head"),
-		}
+		},
 	}
 
 
 @frappe.whitelist()
 def get_pos_settings(pos_profile):
 	"""Get POS Settings for a given POS Profile"""
-	from pos_next.api.constants import POS_SETTINGS_FIELDS, DEFAULT_POS_SETTINGS
+	from pos_next.api.constants import DEFAULT_POS_SETTINGS, POS_SETTINGS_FIELDS
 
 	if not pos_profile:
 		return DEFAULT_POS_SETTINGS.copy()
@@ -78,10 +75,7 @@ def get_pos_settings(pos_profile):
 	try:
 		# Get POS Settings linked to this POS Profile
 		pos_settings = frappe.db.get_value(
-			"POS Settings",
-			{"pos_profile": pos_profile, "enabled": 1},
-			POS_SETTINGS_FIELDS,
-			as_dict=True
+			"POS Next Settings", {"pos_profile": pos_profile, "enabled": 1}, POS_SETTINGS_FIELDS, as_dict=True
 		)
 
 		if not pos_settings:
@@ -119,8 +113,8 @@ def get_payment_methods(pos_profile):
 			.on(POSPaymentMethod.mode_of_payment == ModeOfPayment.name)
 			.left_join(ModeOfPaymentAccount)
 			.on(
-				(ModeOfPaymentAccount.parent == ModeOfPayment.name) &
-				(ModeOfPaymentAccount.company == company)
+				(ModeOfPaymentAccount.parent == ModeOfPayment.name)
+				& (ModeOfPaymentAccount.company == company)
 			)
 			.left_join(Account)
 			.on(Account.name == ModeOfPaymentAccount.default_account)
@@ -129,7 +123,7 @@ def get_payment_methods(pos_profile):
 				POSPaymentMethod.default,
 				POSPaymentMethod.allow_in_returns,
 				Coalesce(ModeOfPayment.type, "Cash").as_("type"),
-				Coalesce(Account.account_type, "").as_("account_type")
+				Coalesce(Account.account_type, "").as_("account_type"),
 			)
 			.where(POSPaymentMethod.parent == pos_profile)
 			.orderby(POSPaymentMethod.idx)
@@ -151,7 +145,7 @@ def get_taxes(pos_profile):
 
 		# Get the POS Profile
 		profile_doc = frappe.get_cached_doc("POS Profile", pos_profile)
-		taxes_and_charges = getattr(profile_doc, 'taxes_and_charges', None)
+		taxes_and_charges = getattr(profile_doc, "taxes_and_charges", None)
 
 		if not taxes_and_charges:
 			return []
@@ -162,17 +156,19 @@ def get_taxes(pos_profile):
 		# Extract tax rows
 		taxes = []
 		for tax_row in template_doc.taxes:
-			taxes.append({
-				"account_head": tax_row.account_head,
-				"charge_type": tax_row.charge_type,
-				"rate": tax_row.rate,
-				"description": tax_row.description,
-				"included_in_print_rate": getattr(tax_row, 'included_in_print_rate', 0),
-				"idx": tax_row.idx
-			})
+			taxes.append(
+				{
+					"account_head": tax_row.account_head,
+					"charge_type": tax_row.charge_type,
+					"rate": tax_row.rate,
+					"description": tax_row.description,
+					"included_in_print_rate": getattr(tax_row, "included_in_print_rate", 0),
+					"idx": tax_row.idx,
+				}
+			)
 
 		return taxes
-	except Exception as e:
+	except Exception:
 		frappe.log_error(frappe.get_traceback(), "Get Taxes Error")
 		# Return empty array instead of throwing - taxes are optional
 		return []
@@ -194,19 +190,15 @@ def get_warehouses(pos_profile):
 		# Get all active warehouses for the company
 		warehouses = frappe.get_list(
 			"Warehouse",
-			filters={
-				"company": company,
-				"disabled": 0,
-				"is_group": 0
-			},
+			filters={"company": company, "disabled": 0, "is_group": 0},
 			fields=["name", "warehouse_name"],
 			order_by="warehouse_name",
-			limit_page_length=0
+			limit_page_length=0,
 		)
 
 		# Return warehouses with human-readable names
 		return warehouses
-	except Exception as e:
+	except Exception:
 		frappe.log_error(frappe.get_traceback(), "Get Warehouses Error")
 		return []
 
@@ -231,7 +223,7 @@ def get_default_customer(pos_profile):
 			}
 
 		return {"customer": None}
-	except Exception as e:
+	except Exception:
 		frappe.log_error(frappe.get_traceback(), "Get Default Customer Error")
 		return {"customer": None}
 
@@ -248,8 +240,7 @@ def update_warehouse(pos_profile, warehouse):
 
 		# Check if user has access to this POS Profile
 		has_access = frappe.db.exists(
-			"POS Profile User",
-			{"parent": pos_profile, "user": frappe.session.user}
+			"POS Profile User", {"parent": pos_profile, "user": frappe.session.user}
 		)
 
 		if not has_access and not frappe.has_permission("POS Profile", "write"):
@@ -265,19 +256,17 @@ def update_warehouse(pos_profile, warehouse):
 
 		# Validate warehouse belongs to same company
 		if warehouse_doc.company != profile_doc.company:
-			frappe.throw(_(
-				"Warehouse {0} belongs to {1}, but POS Profile belongs to {2}"
-			).format(warehouse, warehouse_doc.company, profile_doc.company))
+			frappe.throw(
+				_("Warehouse {0} belongs to {1}, but POS Profile belongs to {2}").format(
+					warehouse, warehouse_doc.company, profile_doc.company
+				)
+			)
 
 		# Update the POS Profile
 		profile_doc.warehouse = warehouse
 		profile_doc.save()
 
-		return {
-			"success": True,
-			"message": _("Warehouse updated successfully"),
-			"warehouse": warehouse
-		}
+		return {"success": True, "message": _("Warehouse updated successfully"), "warehouse": warehouse}
 	except Exception as e:
 		frappe.log_error(frappe.get_traceback(), "Update Warehouse Error")
 		frappe.throw(_("Error updating warehouse: {0}").format(str(e)))
@@ -315,10 +304,7 @@ def get_wallet_payment_flags(methods):
 
 	query = (
 		frappe.qb.from_(ModeOfPayment)
-		.select(
-			ModeOfPayment.name,
-			ModeOfPayment.is_wallet_payment
-		)
+		.select(ModeOfPayment.name, ModeOfPayment.is_wallet_payment)
 		.where(ModeOfPayment.name.isin(methods))
 	)
 
@@ -334,7 +320,7 @@ def get_sales_persons(pos_profile=None):
 	try:
 		filters = {
 			"enabled": 1,
-			"is_group": 0  # Only get individual sales persons, not group nodes
+			"is_group": 0,  # Only get individual sales persons, not group nodes
 		}
 
 		# If company is specified via POS Profile, filter by company (if Sales Person has company field)
@@ -349,19 +335,20 @@ def get_sales_persons(pos_profile=None):
 			filters=filters,
 			fields=["name", "sales_person_name", "commission_rate", "employee"],
 			order_by="sales_person_name",
-			limit_page_length=0
+			limit_page_length=0,
 		)
 
 		return sales_persons
-	except Exception as e:
+	except Exception:
 		frappe.log_error(frappe.get_traceback(), "Get Sales Persons Error")
 		return []
 
+
 @frappe.whitelist()
 def get_create_pos_profile(*args, **kwargs):
 	"""
 	Get selection data for creating POS Profile
-	
+
 	Returns:
 		- warehouses: Available warehouses for user's company
 		- customers: Available customers
@@ -385,40 +372,31 @@ def get_create_pos_profile(*args, **kwargs):
 			"Warehouse",
 			filters={"disabled": 0, "is_group": 0, "company": user_company},
 			fields=["name"],
-			order_by="name"
+			order_by="name",
 		)
 		customers = frappe.get_list(
 			"Customer",
 			filters={"disabled": 0},
 		)
-		
+
 		currencies = frappe.get_list(
 			"Currency",
 			filters={"enabled": 1},
 			fields=["name", "currency_name", "symbol"],
 		)
-		
+
 		payments = frappe.get_list("Mode of Payment")
-		
+
 		posa_cash_mode_of_payment = payments
-	
+
 		write_off_accounts = frappe.get_list(
 			"Account",
-			filters={
-				"report_type": "Profit and Loss",
-				"disabled": 0,
-				"is_group": 0,
-				"company": user_company
-			},
+			filters={"report_type": "Profit and Loss", "disabled": 0, "is_group": 0, "company": user_company},
 		)
 
 		write_off_cost_centers = frappe.get_list(
 			"Cost Center",
-			filters={
-				"is_group": 0,
-				"disabled": 0,
-				"company": user_company
-			},
+			filters={"is_group": 0, "disabled": 0, "company": user_company},
 		)
 
 		applicable_for_users = frappe.get_list(
@@ -427,13 +405,13 @@ def get_create_pos_profile(*args, **kwargs):
 				"enabled": 1,
 			},
 			fields=["name", "full_name"],
-			order_by="full_name"
+			order_by="full_name",
 		)
 		item_groups = frappe.get_list(
 			"Item Group",
 			filters={"is_group": 0},
 		)
-		
+
 		customer_groups = frappe.get_list(
 			"Customer Group",
 			filters={"is_group": 0},
@@ -457,18 +435,19 @@ def get_create_pos_profile(*args, **kwargs):
 			"apply_discount_on_options": [
 				{"value": "Grand Total", "label": "Grand Total"},
 				{"value": "Net Total", "label": "Net Total"},
-			]
+			],
 		}
 		return data
-		
+
 	except Exception as e:
 		frappe.throw(_("Error getting create POS profile: {0}").format(str(e)))
 
+
 @frappe.whitelist()
-def create_pos_profile(*arg ,**parameters):
+def create_pos_profile(*arg, **parameters):
 	"""
 	Create a new POS Profile
-	
+
 	Required fields:
 		- __newname: POS Profile name
 		- currency: Currency code
@@ -477,7 +456,7 @@ def create_pos_profile(*arg ,**parameters):
 		- write_off_account: Account name for write-off
 		- write_off_cost_center: Cost center name
 		- write_off_limit: Write-off limit amount
-	
+
 	Optional fields:
 		- customer: Default customer
 		- applicable_for_users: List of users
@@ -488,25 +467,24 @@ def create_pos_profile(*arg ,**parameters):
 		- apply_discount_on: Discount application method
 	"""
 
-
-		# Extract list parameters 
+	# Extract list parameters
 	payments = parameters.pop("payments", [])
 	applicable_for_users = parameters.pop("applicable_for_users", [])
 	item_groups = parameters.pop("item_groups", [])
 	customer_groups = parameters.pop("customer_groups", [])
 	brands = parameters.pop("brands", [])
-	
+
 	# parse list parameters
 	payments = _parse_list_parameter(payments, "payments")
 	applicable_for_users = _parse_list_parameter(applicable_for_users, "applicable_for_users")
 	item_groups = _parse_list_parameter(item_groups, "item_groups")
 	customer_groups = _parse_list_parameter(customer_groups, "customer_groups")
 	brands = _parse_list_parameter(brands, "brands")
-	
+
 	# Get user's company
 	user_company_data = check_user_company()
 	user_company = user_company_data.get("company")
-	
+
 	if not user_company:
 		frappe.throw(_("User must have a company assigned"))
 
@@ -518,24 +496,30 @@ def create_pos_profile(*arg ,**parameters):
 	# Child tables
 	if not payments or len(payments) == 0:
 		frappe.throw(_("At least one payment method is required"))
-	
+
 	for payment in payments:
 		if isinstance(payment, dict):
-			pos_profile.append("payments", {
-				"mode_of_payment": payment.get("mode_of_payment"),
-				"default": payment.get("default", 0),
-				"allow_in_returns": payment.get("allow_in_returns", 0),
-			})
+			pos_profile.append(
+				"payments",
+				{
+					"mode_of_payment": payment.get("mode_of_payment"),
+					"default": payment.get("default", 0),
+					"allow_in_returns": payment.get("allow_in_returns", 0),
+				},
+			)
 		elif isinstance(payment, str) and payment != "":
 			pos_profile.append("payments", {"mode_of_payment": payment})
 
 	if isinstance(applicable_for_users, list) and len(applicable_for_users) > 0:
 		for user in applicable_for_users:
 			if isinstance(user, dict):
-				pos_profile.append("applicable_for_users", {
-					"user": user.get("user"),
-					"default": user.get("default", 0),
-				})
+				pos_profile.append(
+					"applicable_for_users",
+					{
+						"user": user.get("user"),
+						"default": user.get("default", 0),
+					},
+				)
 			elif isinstance(user, str) and user != "":
 				pos_profile.append("applicable_for_users", {"user": user})
 
@@ -546,7 +530,9 @@ def create_pos_profile(*arg ,**parameters):
 
 	if isinstance(customer_groups, list) and len(customer_groups) > 0:
 		for customer_group in customer_groups:
-			customer_group_name = customer_group if isinstance(customer_group, str) else customer_group.get("customer_group")
+			customer_group_name = (
+				customer_group if isinstance(customer_group, str) else customer_group.get("customer_group")
+			)
 			pos_profile.append("customer_groups", {"customer_group": customer_group_name})
 
 	if isinstance(brands, list) and len(brands) > 0:
@@ -558,14 +544,15 @@ def create_pos_profile(*arg ,**parameters):
 	pos_profile.insert()
 	return pos_profile
 
-@frappe.whitelist()		
+
+@frappe.whitelist()
 def update_pos_profile(*args, **parameters):
 	"""
-		Update an existing POS Profile
-		
-		Args:
-			pos_profile: POS Profile name
-			parameters: Update parameters (all optional)
+	Update an existing POS Profile
+
+	Args:
+		pos_profile: POS Profile name
+		parameters: Update parameters (all optional)
 	"""
 	# Extract child table parameters BEFORE prepare_query_parameters filters them
 	payments = parameters.pop("payments", None)
@@ -580,53 +567,61 @@ def update_pos_profile(*args, **parameters):
 	item_groups = _parse_list_parameter(item_groups, "item_groups")
 	customer_groups = _parse_list_parameter(customer_groups, "customer_groups")
 	brands = _parse_list_parameter(brands, "brands")
-	
+
 	pos_profile = frappe.get_doc("POS Profile", pos_profile_name)
-	
+
 	# Update main fields
 	if parameters:
 		pos_profile.update(parameters)
 
 	if payments is not None:
-		pos_profile.payments = []		
+		pos_profile.payments = []
 		for payment in payments:
 			if isinstance(payment, dict):
 				mode_of_payment = payment.get("mode_of_payment")
 				if mode_of_payment:
-					pos_profile.append("payments", {
-						"mode_of_payment": mode_of_payment,
-						"default": payment.get("default", 0),
-						"allow_in_returns": payment.get("allow_in_returns", 0)
-					})
+					pos_profile.append(
+						"payments",
+						{
+							"mode_of_payment": mode_of_payment,
+							"default": payment.get("default", 0),
+							"allow_in_returns": payment.get("allow_in_returns", 0),
+						},
+					)
 			elif isinstance(payment, str) and payment:
 				pos_profile.append("payments", {"mode_of_payment": payment})
-					
-	
+
 	if applicable_for_users is not None:
 		pos_profile.applicable_for_users = []
 		for user in applicable_for_users:
 			if isinstance(user, dict):
 				user_name = user.get("user") or user.get("name")
-				if user_name:			
-					pos_profile.append("applicable_for_users", {
-						"user": user_name,
-						"default": user.get("default", 0)
-					})
+				if user_name:
+					pos_profile.append(
+						"applicable_for_users", {"user": user_name, "default": user.get("default", 0)}
+					)
 			elif isinstance(user, str):
 				pos_profile.append("applicable_for_users", {"user": user, "default": 0})
-	
+
 	if item_groups is not None:
 		pos_profile.item_groups = []
 		for item_group in item_groups:
-			item_group_name = item_group if isinstance(item_group, str) else item_group.get("item_group") or item_group.get("name")
+			item_group_name = (
+				item_group
+				if isinstance(item_group, str)
+				else item_group.get("item_group") or item_group.get("name")
+			)
 			if item_group_name:
 				pos_profile.append("item_groups", {"item_group": item_group_name})
 
-	
 	if customer_groups is not None:
 		pos_profile.customer_groups = []
 		for customer_group in customer_groups:
-			customer_group_name = customer_group if isinstance(customer_group, str) else customer_group.get("customer_group") or customer_group.get("name")
+			customer_group_name = (
+				customer_group
+				if isinstance(customer_group, str)
+				else customer_group.get("customer_group") or customer_group.get("name")
+			)
 			if customer_group_name:
 				pos_profile.append("customer_groups", {"customer_group": customer_group_name})
 
@@ -636,7 +631,7 @@ def update_pos_profile(*args, **parameters):
 			brand_name = brand if isinstance(brand, str) else brand.get("brand") or brand.get("name")
 			if brand_name:
 				pos_profile.append("custom_brands_table", {"brand": brand_name})
-		
+
 	pos_profile.save()
 
 	# Invalidate cached POS filters so changes are reflected immediately in POS UI
@@ -651,14 +646,15 @@ def update_pos_profile(*args, **parameters):
 		frappe.log_error(frappe.get_traceback(), "POS Profile Cache Invalidation Error")
 
 	return pos_profile
-	
+
+
 @frappe.whitelist()
 def delete_pos_profile(pos_profile):
 	"""
-		Delete a POS Profile
-		
-		Args:
-			pos_profile: POS Profile name
+	Delete a POS Profile
+
+	Args:
+		pos_profile: POS Profile name
 	"""
 	pos_profile = frappe.get_doc("POS Profile", pos_profile)
-	pos_profile.delete()
\ No newline at end of file
+	pos_profile.delete()
diff --git a/pos_next/api/sales_invoice_hooks.py b/pos_next/api/sales_invoice_hooks.py
index 10304f89..7b5c1f0d 100644
--- a/pos_next/api/sales_invoice_hooks.py
+++ b/pos_next/api/sales_invoice_hooks.py
@@ -41,10 +41,7 @@ def apply_tax_inclusive(doc):
 	try:
 		# Get POS Settings for this profile
 		pos_settings = frappe.db.get_value(
-			"POS Settings",
-			{"pos_profile": doc.pos_profile},
-			["tax_inclusive"],
-			as_dict=True
+			"POS Next Settings", {"pos_profile": doc.pos_profile}, ["tax_inclusive"], as_dict=True
 		)
 		tax_inclusive = pos_settings.get("tax_inclusive", 0) if pos_settings else 0
 	except Exception:
@@ -92,10 +89,10 @@ def auto_assign_loyalty_program_on_invoice(doc):
 
 	# Get POS Settings
 	pos_settings = frappe.db.get_value(
-		"POS Settings",
+		"POS Next Settings",
 		{"pos_profile": doc.pos_profile},
 		["enable_loyalty_program", "default_loyalty_program"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	if not pos_settings:
@@ -109,13 +106,7 @@ def auto_assign_loyalty_program_on_invoice(doc):
 		return
 
 	# Assign loyalty program to customer
-	frappe.db.set_value(
-		"Customer",
-		doc.customer,
-		"loyalty_program",
-		loyalty_program,
-		update_modified=False
-	)
+	frappe.db.set_value("Customer", doc.customer, "loyalty_program", loyalty_program, update_modified=False)
 
 
 def before_cancel(doc, method=None):
@@ -129,15 +120,16 @@ def before_cancel(doc, method=None):
 	"""
 	try:
 		from pos_next.api.credit_sales import cancel_credit_journal_entries
+
 		cancel_credit_journal_entries(doc.name)
 	except Exception as e:
 		frappe.log_error(
 			title="Credit Sale JE Cancellation Error",
-			message=f"Invoice: {doc.name}, Error: {str(e)}\n{frappe.get_traceback()}"
+			message=f"Invoice: {doc.name}, Error: {e!s}\n{frappe.get_traceback()}",
 		)
 		# Don't block invoice cancellation if JE cancellation fails
 		frappe.msgprint(
 			_("Warning: Some credit journal entries may not have been cancelled. Please check manually."),
 			alert=True,
-			indicator="orange"
+			indicator="orange",
 		)
diff --git a/pos_next/api/test_customers.py b/pos_next/api/test_customers.py
index fe955b77..bf3dbfe1 100644
--- a/pos_next/api/test_customers.py
+++ b/pos_next/api/test_customers.py
@@ -5,98 +5,107 @@
 from unittest.mock import Mock, patch
 
 from pos_next.api.customers import (
-    _get_customer_assignment_context,
-    create_customer,
-    get_customers,
-    get_default_loyalty_program_from_settings,
+	_get_customer_assignment_context,
+	create_customer,
+	get_customers,
+	get_default_loyalty_program_from_settings,
 )
 
 
 class TestCustomersAPI(unittest.TestCase):
-    @patch("pos_next.api.customers.frappe.logger")
-    @patch("pos_next.api.customers.frappe.get_all")
-    @patch("pos_next.api.customers.frappe.db")
-    def test_get_customers_applies_search_term_filters(self, mock_db, mock_get_all, mock_logger):
-        mock_logger.return_value = Mock()
-        mock_get_all.return_value = []
-
-        get_customers(search_term="john", limit=10)
-
-        mock_get_all.assert_called_once()
-        kwargs = mock_get_all.call_args.kwargs
-        self.assertEqual(kwargs["filters"], {"disabled": 0})
-        self.assertEqual(
-            kwargs["or_filters"],
-            [
-                ["Customer", "name", "like", "%john%"],
-                ["Customer", "customer_name", "like", "%john%"],
-                ["Customer", "mobile_no", "like", "%john%"],
-                ["Customer", "email_id", "like", "%john%"],
-            ],
-        )
-
-    @patch("pos_next.api.customers.frappe.db")
-    def test_get_default_loyalty_program_from_settings_uses_explicit_pos_profile(self, mock_db):
-        mock_db.get_value.return_value = "LOYALTY-A"
-
-        result = get_default_loyalty_program_from_settings(pos_profile="POS-A")
-
-        self.assertEqual(result, "LOYALTY-A")
-        mock_db.get_value.assert_called_once_with(
-            "POS Settings",
-            {"enabled": 1, "pos_profile": "POS-A"},
-            "default_loyalty_program",
-        )
-
-    @patch("pos_next.api.customers.frappe.get_cached_value")
-    @patch("pos_next.api.customers.frappe.get_all")
-    def test_get_default_loyalty_program_from_settings_skips_ambiguous_company_context(
-        self,
-        mock_get_all,
-        mock_get_cached_value,
-    ):
-        mock_get_all.return_value = [
-            Mock(pos_profile="POS-1", default_loyalty_program="LOYALTY-A"),
-            Mock(pos_profile="POS-2", default_loyalty_program="LOYALTY-B"),
-        ]
-        mock_get_cached_value.side_effect = ["Company A", "Company A"]
-
-        result = get_default_loyalty_program_from_settings(company="Company A")
-
-        self.assertIsNone(result)
-
-    @patch("pos_next.api.customers.frappe.local", new=Mock(form_dict={"company": "Company A", "pos_profile": "POS-A"}))
-    @patch("pos_next.api.customers.frappe.flags", new=Mock(pos_next_customer_company=None, pos_next_customer_pos_profile=None))
-    def test_get_customer_assignment_context_uses_request_context(self):
-        company, pos_profile = _get_customer_assignment_context()
-
-        self.assertEqual(company, "Company A")
-        self.assertEqual(pos_profile, "POS-A")
-
-    @patch("pos_next.api.customers.frappe.flags", new=Mock(pos_next_customer_company=None, pos_next_customer_pos_profile=None))
-    @patch("pos_next.api.customers.frappe.get_doc")
-    @patch("pos_next.api.customers.get_default_loyalty_program_from_settings")
-    @patch("pos_next.api.customers.frappe.has_permission")
-    def test_create_customer_uses_pos_profile_for_loyalty_assignment(
-        self,
-        mock_has_permission,
-        mock_get_loyalty,
-        mock_get_doc,
-    ):
-        mock_has_permission.return_value = True
-        mock_get_loyalty.return_value = "LOYALTY-A"
-
-        customer_doc = Mock()
-        customer_doc.as_dict.return_value = {"name": "CUST-0001", "loyalty_program": "LOYALTY-A"}
-        mock_get_doc.return_value = customer_doc
-
-        result = create_customer(
-            customer_name="John Doe",
-            customer_group="Individual",
-            territory="All Territories",
-            pos_profile="POS-A",
-        )
-
-        mock_get_loyalty.assert_called_once_with(company=None, pos_profile="POS-A")
-        customer_doc.insert.assert_called_once_with()
-        self.assertEqual(result["loyalty_program"], "LOYALTY-A")
+	@patch("pos_next.api.customers.frappe.logger")
+	@patch("pos_next.api.customers.frappe.get_all")
+	@patch("pos_next.api.customers.frappe.db")
+	def test_get_customers_applies_search_term_filters(self, mock_db, mock_get_all, mock_logger):
+		mock_logger.return_value = Mock()
+		mock_get_all.return_value = []
+
+		get_customers(search_term="john", limit=10)
+
+		mock_get_all.assert_called_once()
+		kwargs = mock_get_all.call_args.kwargs
+		self.assertEqual(kwargs["filters"], {"disabled": 0})
+		self.assertEqual(
+			kwargs["or_filters"],
+			[
+				["Customer", "name", "like", "%john%"],
+				["Customer", "customer_name", "like", "%john%"],
+				["Customer", "mobile_no", "like", "%john%"],
+				["Customer", "email_id", "like", "%john%"],
+			],
+		)
+
+	@patch("pos_next.api.customers.frappe.db")
+	def test_get_default_loyalty_program_from_settings_uses_explicit_pos_profile(self, mock_db):
+		mock_db.get_value.return_value = "LOYALTY-A"
+
+		result = get_default_loyalty_program_from_settings(pos_profile="POS-A")
+
+		self.assertEqual(result, "LOYALTY-A")
+		mock_db.get_value.assert_called_once_with(
+			"POS Next Settings",
+			{"enabled": 1, "pos_profile": "POS-A"},
+			"default_loyalty_program",
+		)
+
+	@patch("pos_next.api.customers.frappe.get_cached_value")
+	@patch("pos_next.api.customers.frappe.get_all")
+	def test_get_default_loyalty_program_from_settings_skips_ambiguous_company_context(
+		self,
+		mock_get_all,
+		mock_get_cached_value,
+	):
+		mock_get_all.return_value = [
+			Mock(pos_profile="POS-1", default_loyalty_program="LOYALTY-A"),
+			Mock(pos_profile="POS-2", default_loyalty_program="LOYALTY-B"),
+		]
+		mock_get_cached_value.side_effect = ["Company A", "Company A"]
+
+		result = get_default_loyalty_program_from_settings(company="Company A")
+
+		self.assertIsNone(result)
+
+	@patch(
+		"pos_next.api.customers.frappe.local",
+		new=Mock(form_dict={"company": "Company A", "pos_profile": "POS-A"}),
+	)
+	@patch(
+		"pos_next.api.customers.frappe.flags",
+		new=Mock(pos_next_customer_company=None, pos_next_customer_pos_profile=None),
+	)
+	def test_get_customer_assignment_context_uses_request_context(self):
+		company, pos_profile = _get_customer_assignment_context()
+
+		self.assertEqual(company, "Company A")
+		self.assertEqual(pos_profile, "POS-A")
+
+	@patch(
+		"pos_next.api.customers.frappe.flags",
+		new=Mock(pos_next_customer_company=None, pos_next_customer_pos_profile=None),
+	)
+	@patch("pos_next.api.customers.frappe.get_doc")
+	@patch("pos_next.api.customers.get_default_loyalty_program_from_settings")
+	@patch("pos_next.api.customers.frappe.has_permission")
+	def test_create_customer_uses_pos_profile_for_loyalty_assignment(
+		self,
+		mock_has_permission,
+		mock_get_loyalty,
+		mock_get_doc,
+	):
+		mock_has_permission.return_value = True
+		mock_get_loyalty.return_value = "LOYALTY-A"
+
+		customer_doc = Mock()
+		customer_doc.as_dict.return_value = {"name": "CUST-0001", "loyalty_program": "LOYALTY-A"}
+		mock_get_doc.return_value = customer_doc
+
+		result = create_customer(
+			customer_name="John Doe",
+			customer_group="Individual",
+			territory="All Territories",
+			pos_profile="POS-A",
+		)
+
+		mock_get_loyalty.assert_called_once_with(company=None, pos_profile="POS-A")
+		customer_doc.insert.assert_called_once_with()
+		self.assertEqual(result["loyalty_program"], "LOYALTY-A")
diff --git a/pos_next/api/wallet.py b/pos_next/api/wallet.py
index 6e3e9e5d..5caa1bcb 100644
--- a/pos_next/api/wallet.py
+++ b/pos_next/api/wallet.py
@@ -8,7 +8,7 @@
 
 import frappe
 from frappe import _
-from frappe.utils import flt, cint
+from frappe.utils import cint, flt
 
 
 def validate_wallet_payment(doc, method=None):
@@ -32,9 +32,9 @@ def validate_wallet_payment(doc, method=None):
 		frappe.throw(
 			_("Insufficient wallet balance. Available: {0}, Requested: {1}").format(
 				frappe.format_value(wallet_balance, {"fieldtype": "Currency"}),
-				frappe.format_value(wallet_amount, {"fieldtype": "Currency"})
+				frappe.format_value(wallet_amount, {"fieldtype": "Currency"}),
 			),
-			title=_("Wallet Balance Error")
+			title=_("Wallet Balance Error"),
 		)
 
 
@@ -51,7 +51,9 @@ def process_loyalty_to_wallet(doc, method=None):
 	if not pos_settings:
 		return
 
-	if not cint(pos_settings.get("enable_loyalty_program")) or not cint(pos_settings.get("loyalty_to_wallet")):
+	if not cint(pos_settings.get("enable_loyalty_program")) or not cint(
+		pos_settings.get("loyalty_to_wallet")
+	):
 		return
 
 	# Check if customer has loyalty program
@@ -79,13 +81,9 @@ def process_loyalty_to_wallet(doc, method=None):
 	# Get the loyalty points earned from this invoice
 	loyalty_entry = frappe.db.get_value(
 		"Loyalty Point Entry",
-		{
-			"invoice_type": "Sales Invoice",
-			"invoice": doc.name,
-			"loyalty_points": [">", 0]
-		},
+		{"invoice_type": "Sales Invoice", "invoice": doc.name, "loyalty_points": [">", 0]},
 		["loyalty_points", "name"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	if not loyalty_entry or loyalty_entry.loyalty_points <= 0:
@@ -110,33 +108,32 @@ def process_loyalty_to_wallet(doc, method=None):
 		# Create wallet transaction
 		from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import create_wallet_credit
 
-		transaction = create_wallet_credit(
+		create_wallet_credit(
 			wallet=wallet.name,
 			amount=credit_amount,
 			source_type="Loyalty Program",
 			remarks=_("Loyalty points conversion from {0}: {1} points = {2}").format(
 				doc.name,
 				loyalty_entry.loyalty_points,
-				frappe.format_value(credit_amount, {"fieldtype": "Currency"})
+				frappe.format_value(credit_amount, {"fieldtype": "Currency"}),
 			),
 			reference_doctype="Sales Invoice",
 			reference_name=doc.name,
-			submit=True
+			submit=True,
 		)
 
 		frappe.msgprint(
 			_("Loyalty points converted to wallet: {0} points = {1}").format(
-				loyalty_entry.loyalty_points,
-				frappe.format_value(credit_amount, {"fieldtype": "Currency"})
+				loyalty_entry.loyalty_points, frappe.format_value(credit_amount, {"fieldtype": "Currency"})
 			),
 			alert=True,
-			indicator="green"
+			indicator="green",
 		)
 
 	except Exception as e:
 		frappe.log_error(
 			title="Loyalty to Wallet Conversion Error",
-			message=f"Invoice: {doc.name}, Error: {str(e)}\n{frappe.get_traceback()}"
+			message=f"Invoice: {doc.name}, Error: {e!s}\n{frappe.get_traceback()}",
 		)
 
 
@@ -150,11 +147,7 @@ def get_wallet_amount_from_payments(payments):
 		if not payment.mode_of_payment:
 			continue
 
-		is_wallet = frappe.db.get_value(
-			"Mode of Payment",
-			payment.mode_of_payment,
-			"is_wallet_payment"
-		)
+		is_wallet = frappe.db.get_value("Mode of Payment", payment.mode_of_payment, "is_wallet_payment")
 
 		if is_wallet:
 			wallet_amount += flt(payment.amount)
@@ -192,11 +185,7 @@ def get_customer_wallet_balance(customer, company=None, exclude_invoice=None):
 			return 0.0
 
 		# Get balance from GL entries
-		gl_balance = get_balance_on(
-			account=wallet.account,
-			party_type="Customer",
-			party=customer
-		)
+		gl_balance = get_balance_on(account=wallet.account, party_type="Customer", party=customer)
 
 		# Negate because negative receivable balance = positive wallet credit
 		wallet_balance = -flt(gl_balance)
@@ -217,18 +206,9 @@ def get_pending_wallet_payments(customer, exclude_invoice=None):
 	"""
 	Get total wallet payments from unconsolidated/pending POS invoices.
 	"""
-	filters = {
-		"customer": customer,
-		"docstatus": ["in", [0, 1]],
-		"outstanding_amount": [">", 0],
-		"is_pos": 1
-	}
+	filters = {"customer": customer, "docstatus": ["in", [0, 1]], "outstanding_amount": [">", 0], "is_pos": 1}
 
-	invoices = frappe.get_all(
-		"Sales Invoice",
-		filters=filters,
-		fields=["name"]
-	)
+	invoices = frappe.get_all("Sales Invoice", filters=filters, fields=["name"])
 
 	pending_amount = 0.0
 
@@ -237,15 +217,11 @@ def get_pending_wallet_payments(customer, exclude_invoice=None):
 			continue
 
 		payments = frappe.get_all(
-			"Sales Invoice Payment",
-			filters={"parent": invoice.name},
-			fields=["mode_of_payment", "amount"]
+			"Sales Invoice Payment", filters={"parent": invoice.name}, fields=["mode_of_payment", "amount"]
 		)
 
 		for payment in payments:
-			is_wallet = frappe.db.get_value(
-				"Mode of Payment", payment.mode_of_payment, "is_wallet_payment"
-			)
+			is_wallet = frappe.db.get_value("Mode of Payment", payment.mode_of_payment, "is_wallet_payment")
 			if is_wallet:
 				pending_amount += flt(payment.amount)
 
@@ -263,7 +239,7 @@ def get_customer_wallet(customer, company=None):
 		"Wallet",
 		filters,
 		["name", "customer", "company", "account", "status", "current_balance"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	if wallet:
@@ -281,11 +257,7 @@ def create_wallet_on_customer_insert(doc, method=None):
 		return
 
 	# Only auto-create wallets when a POS profile with auto_create_wallet exists
-	pos_profile = frappe.db.get_value(
-		"POS Profile",
-		{"company": company, "disabled": 0},
-		"name"
-	)
+	pos_profile = frappe.db.get_value("POS Profile", {"company": company, "disabled": 0}, "name")
 	if not pos_profile:
 		return
 
@@ -308,7 +280,7 @@ def get_or_create_wallet(customer, company, pos_settings=None, force_create=Fals
 		"Wallet",
 		{"customer": customer, "company": company},
 		["name", "customer", "company", "account", "status"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	if wallet:
@@ -316,11 +288,7 @@ def get_or_create_wallet(customer, company, pos_settings=None, force_create=Fals
 
 	# Check if auto-create is enabled
 	if not pos_settings:
-		pos_profile = frappe.db.get_value(
-			"POS Profile",
-			{"company": company, "disabled": 0},
-			"name"
-		)
+		pos_profile = frappe.db.get_value("POS Profile", {"company": company, "disabled": 0}, "name")
 		if pos_profile:
 			pos_settings = get_pos_settings(pos_profile)
 
@@ -336,13 +304,8 @@ def get_or_create_wallet(customer, company, pos_settings=None, force_create=Fals
 		# Try to find a receivable account with 'wallet' in name
 		wallet_account = frappe.db.get_value(
 			"Account",
-			{
-				"company": company,
-				"account_type": "Receivable",
-				"is_group": 0,
-				"name": ["like", "%wallet%"]
-			},
-			"name"
+			{"company": company, "account_type": "Receivable", "is_group": 0, "name": ["like", "%wallet%"]},
+			"name",
 		)
 
 	if not wallet_account:
@@ -351,29 +314,27 @@ def get_or_create_wallet(customer, company, pos_settings=None, force_create=Fals
 
 	if not wallet_account:
 		frappe.log_error(
-			f"Cannot create wallet for {customer}: No wallet account configured",
-			"Wallet Creation Error"
+			f"Cannot create wallet for {customer}: No wallet account configured", "Wallet Creation Error"
 		)
 		return None
 
 	# Create new wallet
 	try:
-		wallet_doc = frappe.get_doc({
-			"doctype": "Wallet",
-			"customer": customer,
-			"company": company,
-			"account": wallet_account,
-			"status": "Active"
-		})
+		wallet_doc = frappe.get_doc(
+			{
+				"doctype": "Wallet",
+				"customer": customer,
+				"company": company,
+				"account": wallet_account,
+				"status": "Active",
+			}
+		)
 		wallet_doc.insert(ignore_permissions=True)
 
 		return wallet_doc
 
 	except Exception as e:
-		frappe.log_error(
-			f"Failed to create wallet for {customer}: {str(e)}",
-			"Wallet Creation Error"
-		)
+		frappe.log_error(f"Failed to create wallet for {customer}: {e!s}", "Wallet Creation Error")
 		return None
 
 
@@ -383,16 +344,16 @@ def get_pos_settings(pos_profile):
 		return None
 
 	return frappe.db.get_value(
-		"POS Settings",
+		"POS Next Settings",
 		{"pos_profile": pos_profile},
 		[
 			"enable_loyalty_program",
 			"default_loyalty_program",
 			"wallet_account",
 			"auto_create_wallet",
-			"loyalty_to_wallet"
+			"loyalty_to_wallet",
 		],
-		as_dict=True
+		as_dict=True,
 	)
 
 
@@ -400,24 +361,20 @@ def get_pos_settings(pos_profile):
 def get_wallet_payment_methods(pos_profile):
 	"""Get payment methods that are wallet-enabled for a POS profile."""
 	payment_methods = frappe.get_all(
-		"POS Payment Method",
-		filters={"parent": pos_profile},
-		fields=["mode_of_payment", "default"]
+		"POS Payment Method", filters={"parent": pos_profile}, fields=["mode_of_payment", "default"]
 	)
 
 	wallet_methods = []
 	for method in payment_methods:
-		is_wallet = frappe.db.get_value(
-			"Mode of Payment",
-			method.mode_of_payment,
-			"is_wallet_payment"
-		)
+		is_wallet = frappe.db.get_value("Mode of Payment", method.mode_of_payment, "is_wallet_payment")
 		if is_wallet:
-			wallet_methods.append({
-				"mode_of_payment": method.mode_of_payment,
-				"default": method.default,
-				"is_wallet_payment": True
-			})
+			wallet_methods.append(
+				{
+					"mode_of_payment": method.mode_of_payment,
+					"default": method.default,
+					"is_wallet_payment": True,
+				}
+			)
 
 	return wallet_methods
 
@@ -436,7 +393,7 @@ def get_wallet_info(customer, company, pos_profile=None):
 		"wallet_name": None,
 		"auto_create": False,
 		"loyalty_program": None,
-		"loyalty_to_wallet": False
+		"loyalty_to_wallet": False,
 	}
 
 	# Check if loyalty program is enabled in POS Settings
@@ -457,7 +414,7 @@ def get_wallet_info(customer, company, pos_profile=None):
 		"Wallet",
 		{"customer": customer, "company": company, "status": ["in", ["Active", "active"]]},
 		["name", "account"],
-		as_dict=True
+		as_dict=True,
 	)
 
 	if wallet:
@@ -470,12 +427,14 @@ def get_wallet_info(customer, company, pos_profile=None):
 			new_wallet = get_or_create_wallet(customer, company, pos_settings)
 			if new_wallet:
 				result["wallet_exists"] = True
-				result["wallet_name"] = new_wallet.name if hasattr(new_wallet, 'name') else new_wallet.get("name")
+				result["wallet_name"] = (
+					new_wallet.name if hasattr(new_wallet, "name") else new_wallet.get("name")
+				)
 				result["wallet_balance"] = 0.0  # New wallet starts with 0 balance
 		except Exception as e:
 			frappe.log_error(
 				title="Auto-create Wallet Error",
-				message=f"Customer: {customer}, Company: {company}, Error: {str(e)}"
+				message=f"Customer: {customer}, Company: {company}, Error: {e!s}",
 			)
 
 	return result
@@ -509,11 +468,11 @@ def create_manual_wallet_credit(customer, company, amount, remarks=None):
 	from pos_next.pos_next.doctype.wallet_transaction.wallet_transaction import create_wallet_credit
 
 	transaction = create_wallet_credit(
-		wallet=wallet.name if hasattr(wallet, 'name') else wallet["name"],
+		wallet=wallet.name if hasattr(wallet, "name") else wallet["name"],
 		amount=amount,
 		source_type="Manual Adjustment",
 		remarks=remarks or _("Manual wallet credit"),
-		submit=True
+		submit=True,
 	)
 
 	return transaction.name
diff --git a/pos_next/overrides/sales_invoice.py b/pos_next/overrides/sales_invoice.py
index 069d5047..ba4a2c0f 100644
--- a/pos_next/overrides/sales_invoice.py
+++ b/pos_next/overrides/sales_invoice.py
@@ -8,9 +8,10 @@
 """
 
 import frappe
-from frappe.utils import cint, flt
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice
 from erpnext.accounts.utils import get_account_currency
+from frappe.utils import cint, flt
+
 
 def _get_post_change_gl_entries_setting():
 	"""
@@ -19,8 +20,8 @@ def _get_post_change_gl_entries_setting():
 	- ERPNext v15: Field is in 'Accounts Settings'
 	- ERPNext v16: Field moved to ERPNext's 'POS Settings' (singleton)
 
-	Since pos_next has its own 'POS Settings' doctype (non-singleton) that overrides
-	ERPNext's, we read directly from the Singles table for v16 compatibility.
+	pos_next's per-profile settings now live on 'POS Next Settings' so there
+	is no DocType collision with ERPNext's single 'POS Settings' on v16.
 
 	Returns:
 		int: 1 if post_change_gl_entries is enabled, 0 otherwise (default: 0)
@@ -31,18 +32,10 @@ def _get_post_change_gl_entries_setting():
 		value = frappe.db.get_single_value("Accounts Settings", "post_change_gl_entries")
 		return cint(value) if value is not None else 0
 
-	# For v16, read directly from Singles table using Query Builder to avoid ORM issues
-	# ERPNext's POS Settings is a singleton, data stored in Singles table
-	Singles = frappe.qb.DocType("Singles")
-	result = (
-		frappe.qb.from_(Singles)
-		.select(Singles.value)
-		.where(Singles.doctype == "POS Settings")
-		.where(Singles.field == "post_change_gl_entries")
-		.limit(1)
-		.run()
-	)
-	return cint(result[0][0]) if result else 0
+	# ERPNext v16: read the setting from erpnext's singleton POS Settings.
+	value = frappe.db.get_single_value("POS Settings", "post_change_gl_entries")
+	return cint(value) if value is not None else 0
+
 
 class CustomSalesInvoice(SalesInvoice):
 	"""
diff --git a/pos_next/patches.txt b/pos_next/patches.txt
index 6c51d983..a3768270 100644
--- a/pos_next/patches.txt
+++ b/pos_next/patches.txt
@@ -1,6 +1,7 @@
 [pre_model_sync]
 # Patches added in this section will be executed before doctypes are migrated
 # Read docs to understand patches: https://frappeframework.com/docs/v14/user/en/database-migrations
+pos_next.patches.v1_7_0.rename_pos_settings_to_pos_next_settings
 
 [post_model_sync]
 # Patches added in this section will be executed after doctypes are migrated
diff --git a/pos_next/patches/v1_7_0/rename_pos_settings_to_pos_next_settings.py b/pos_next/patches/v1_7_0/rename_pos_settings_to_pos_next_settings.py
new file mode 100644
index 00000000..2bc66f7b
--- /dev/null
+++ b/pos_next/patches/v1_7_0/rename_pos_settings_to_pos_next_settings.py
@@ -0,0 +1,129 @@
+"""Rename pos_next's 'POS Settings' DocType to 'POS Next Settings'.
+
+Background
+==========
+pos_next historically shipped a per-profile (non-single) DocType named
+'POS Settings'. ERPNext v16 introduces its own single 'POS Settings' with
+fields like invoice_type and post_change_gl_entries, which collides with
+pos_next's doctype and breaks 'bench migrate' (v16 patches 1 + 22).
+
+This patch runs in pre_model_sync so it executes BEFORE ERPNext v16's
+DocType sync creates the new single 'POS Settings'. It renames the
+pos_next row in tabDocType and the underlying 'tabPOS Settings' MySQL
+table to 'tabPOS Next Settings', leaving the 'POS Settings' name free
+for ERPNext v16 to install into.
+
+MariaDB 1412 handling
+=====================
+frappe.rename_doc does the parent-table DDL (RENAME TABLE) before
+updating link fields that point at the old doctype name. MariaDB
+invalidates the session's table-metadata cache after the DDL and the
+next UPDATE raises error 1412 ("Table definition has changed, please
+retry transaction"). The DDL itself succeeded — the parent table and
+tabDocType row are already renamed. We swallow 1412, reconnect, and
+manually finish the link-field / dynamic-link / user-settings fixups
+with a fresh session.
+
+Idempotency
+===========
+Safe to re-run and safe on every entry state:
+
+1. v15 site with pos_next's 'POS Settings' installed — the rename runs.
+2. Already renamed — 'POS Settings' is absent or already an ERPNext single;
+   the rename is skipped.
+3. Fresh v16 install where pos_next is being installed for the first time —
+   'POS Settings' either does not exist yet or exists as ERPNext's single;
+   the rename is skipped.
+"""
+
+import frappe
+
+
+def _is_table_def_changed_error(exc: Exception) -> bool:
+	msg = str(exc)
+	return "1412" in msg or "Table definition has changed" in msg
+
+
+def _finish_rename_manually(old: str, new: str) -> None:
+	"""Re-run the post-DDL portion of rename_doc with a fresh connection."""
+	from frappe.model.rename_doc import (
+		get_link_fields,
+		rename_dynamic_links,
+		update_attachments,
+		update_link_field_values,
+		update_user_settings,
+	)
+
+	# Reset the session so the cursor has fresh table metadata after the DDL.
+	frappe.db.commit()
+	frappe.db.close()
+	frappe.db.connect()
+
+	link_fields = get_link_fields(new)
+	update_link_field_values(link_fields, old, new, new)
+	rename_dynamic_links(new, old, new)
+	update_user_settings(old, new, link_fields)
+	update_attachments(new, old, new)
+	frappe.db.commit()
+
+
+def execute():
+	if not frappe.db.table_exists("DocType"):
+		return
+
+	if not frappe.db.exists("DocType", "POS Settings"):
+		return
+
+	doctype_row = frappe.db.get_value(
+		"DocType",
+		"POS Settings",
+		["module", "issingle"],
+		as_dict=True,
+	)
+	if not doctype_row:
+		return
+
+	if doctype_row.issingle:
+		# ERPNext v16's single already owns the name — nothing to rename.
+		return
+
+	if doctype_row.module != "POS Next":
+		# A non-single 'POS Settings' owned by something other than pos_next
+		# is unexpected. Log and bail rather than mutate unknown state.
+		frappe.log_error(
+			title="pos_next rename_pos_settings patch skipped",
+			message=(
+				f"Expected 'POS Settings' to belong to module 'POS Next', "
+				f"found '{doctype_row.module}'. Skipping rename."
+			),
+		)
+		return
+
+	if frappe.db.exists("DocType", "POS Next Settings"):
+		# Previous partial run left both around — drop the stale source row
+		# so model sync can re-create the canonical 'POS Settings' single.
+		frappe.delete_doc("DocType", "POS Settings", force=True, ignore_permissions=True)
+		frappe.db.commit()
+		return
+
+	# Clean transaction state before the DDL-heavy rename.
+	frappe.db.commit()
+
+	try:
+		frappe.rename_doc(
+			"DocType",
+			"POS Settings",
+			"POS Next Settings",
+			force=True,
+			show_alert=False,
+			rebuild_search=False,
+		)
+	except Exception as exc:
+		if not _is_table_def_changed_error(exc):
+			raise
+		# The RENAME TABLE + tabDocType update already succeeded; only the
+		# downstream link-field update tripped on stale session metadata.
+		# Finish manually with a fresh connection.
+		_finish_rename_manually("POS Settings", "POS Next Settings")
+
+	frappe.db.commit()
diff --git a/pos_next/pos_next/doctype/pos_settings/__init__.py b/pos_next/pos_next/doctype/pos_next_settings/__init__.py
similarity index 100%
rename from pos_next/pos_next/doctype/pos_settings/__init__.py
rename to pos_next/pos_next/doctype/pos_next_settings/__init__.py
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.js b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.js
similarity index 95%
rename from pos_next/pos_next/doctype/pos_settings/pos_settings.js
rename to pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.js
index 27e15eef..7d865534 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.js
+++ b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2024, BrainWise and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("POS Settings", {
+frappe.ui.form.on("POS Next Settings", {
 	refresh(frm) {
 		// Set query for loyalty program filtered by POS Profile company
 		frm.set_query("default_loyalty_program", function () {
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.json b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.json
similarity index 99%
rename from pos_next/pos_next/doctype/pos_settings/pos_settings.json
rename to pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.json
index c5711a43..0c24f610 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.json
+++ b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.json
@@ -553,7 +553,7 @@
  "modified": "2026-01-11 16:52:08.009217",
  "modified_by": "Administrator",
  "module": "POS Next",
- "name": "POS Settings",
+ "name": "POS Next Settings",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [
diff --git a/pos_next/pos_next/doctype/pos_settings/pos_settings.py b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.py
similarity index 71%
rename from pos_next/pos_next/doctype/pos_settings/pos_settings.py
rename to pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.py
index 7cec9262..48b93c18 100644
--- a/pos_next/pos_next/doctype/pos_settings/pos_settings.py
+++ b/pos_next/pos_next/doctype/pos_next_settings/pos_next_settings.py
@@ -6,9 +6,9 @@
 from frappe.utils import cint, flt
 
 
-class POSSettings(Document):
+class POSNextSettings(Document):
 	def validate(self):
-		"""Validate POS Settings"""
+		"""Validate POS Next Settings"""
 		# Guard against None values and validate discount percentage
 		max_discount = flt(self.max_discount_allowed)
 		if max_discount < 0 or max_discount > 100:
@@ -41,9 +41,9 @@ def sync_negative_stock_setting(self):
 		"""
 		Synchronize allow_negative_stock with Stock Settings.
 
-		When enabled in POS Settings, it enables the global Stock Settings.
+		When enabled in POS Next Settings, it enables the global Stock Settings.
 		When disabled, it only disables global Stock Settings if no other
-		POS Settings have it enabled.
+		POS Next Settings have it enabled.
 
 		Note: Runs in the same transaction as the save, no manual commits.
 		"""
@@ -58,34 +58,36 @@ def sync_negative_stock_setting(self):
 				frappe.msgprint(
 					"Stock Settings 'Allow Negative Stock' has been automatically enabled.",
 					indicator="green",
-					alert=True
+					alert=True,
 				)
 		else:
-			# Only disable if no other enabled POS Settings have it enabled
+			# Only disable if no other enabled POS Next Settings have it enabled
 			if current_stock_setting:
 				# Use count for better performance and clarity
 				other_enabled_count = frappe.db.count(
-					"POS Settings",
+					"POS Next Settings",
 					{
 						"allow_negative_stock": 1,
-						"enabled": 1,  # Only check enabled POS Settings
-						"name": ["!=", self.name]
-					}
+						"enabled": 1,  # Only check enabled POS Next Settings
+						"name": ["!=", self.name],
+					},
 				)
 
 				if other_enabled_count == 0:
-					frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 0, update_modified=False)
+					frappe.db.set_single_value(
+						"Stock Settings", "allow_negative_stock", 0, update_modified=False
+					)
 					frappe.msgprint(
 						"Stock Settings 'Allow Negative Stock' has been automatically disabled.",
 						indicator="orange",
-						alert=True
+						alert=True,
 					)
 
 
 @frappe.whitelist()
 def get_pos_settings(pos_profile):
 	"""
-	Get POS Settings for a specific POS Profile.
+	Get POS Next Settings for a specific POS Profile.
 
 	Also injects the current global Stock Settings value to show the actual
 	source of truth, preventing confusion when the checkbox appears enabled
@@ -97,27 +99,19 @@ def get_pos_settings(pos_profile):
 		return None
 
 	# Check if user has access to this POS Profile
-	has_access = frappe.db.exists(
-		"POS Profile User",
-		{"parent": pos_profile, "user": frappe.session.user}
-	)
+	has_access = frappe.db.exists("POS Profile User", {"parent": pos_profile, "user": frappe.session.user})
 
-	if not has_access and not frappe.has_permission("POS Settings", "read"):
+	if not has_access and not frappe.has_permission("POS Next Settings", "read"):
 		frappe.throw(_("You don't have access to this POS Profile"))
 
-	settings = frappe.db.get_value(
-		"POS Settings",
-		{"pos_profile": pos_profile},
-		"*",
-		as_dict=True
-	)
+	settings = frappe.db.get_value("POS Next Settings", {"pos_profile": pos_profile}, "*", as_dict=True)
 
 	# If no settings exist, create default settings
 	if not settings:
 		settings = create_default_settings(pos_profile)
 
 	# Inject the current global Stock Settings value for transparency
-	# This helps UI reflect the actual state even if multiple POS Settings exist
+	# This helps UI reflect the actual state even if multiple POS Next Settings exist
 	settings["_global_allow_negative_stock"] = cint(
 		frappe.db.get_single_value("Stock Settings", "allow_negative_stock") or 0
 	)
@@ -126,8 +120,8 @@ def get_pos_settings(pos_profile):
 
 
 def create_default_settings(pos_profile):
-	"""Create default POS Settings for a POS Profile"""
-	doc = frappe.new_doc("POS Settings")
+	"""Create default POS Next Settings for a POS Profile"""
+	doc = frappe.new_doc("POS Next Settings")
 	doc.pos_profile = pos_profile
 	doc.enabled = 1
 	doc.insert()
@@ -137,31 +131,29 @@ def create_default_settings(pos_profile):
 
 @frappe.whitelist()
 def update_pos_settings(pos_profile, settings):
-	"""Update POS Settings for a POS Profile"""
+	"""Update POS Next Settings for a POS Profile"""
 	import json
+
 	from frappe import _
 
 	if isinstance(settings, str):
 		settings = json.loads(settings)
 
 	# Check if user has access to this POS Profile
-	has_access = frappe.db.exists(
-		"POS Profile User",
-		{"parent": pos_profile, "user": frappe.session.user}
-	)
+	has_access = frappe.db.exists("POS Profile User", {"parent": pos_profile, "user": frappe.session.user})
 
-	if not has_access and not frappe.has_permission("POS Settings", "write"):
+	if not has_access and not frappe.has_permission("POS Next Settings", "write"):
 		frappe.throw(_("You don't have permission to update this POS Profile"))
 
 	# Check if settings exist
-	existing = frappe.db.exists("POS Settings", {"pos_profile": pos_profile})
+	existing = frappe.db.exists("POS Next Settings", {"pos_profile": pos_profile})
 
 	if existing:
-		doc = frappe.get_doc("POS Settings", existing)
+		doc = frappe.get_doc("POS Next Settings", existing)
 		doc.update(settings)
 		doc.save()
 	else:
-		doc = frappe.new_doc("POS Settings")
+		doc = frappe.new_doc("POS Next Settings")
 		doc.pos_profile = pos_profile
 		doc.update(settings)
 		doc.insert()
diff --git a/pos_next/pos_next/doctype/pos_settings/test_pos_settings.py b/pos_next/pos_next/doctype/pos_next_settings/test_pos_next_settings.py
similarity index 76%
rename from pos_next/pos_next/doctype/pos_settings/test_pos_settings.py
rename to pos_next/pos_next/doctype/pos_next_settings/test_pos_next_settings.py
index 840cac91..7871cad8 100644
--- a/pos_next/pos_next/doctype/pos_settings/test_pos_settings.py
+++ b/pos_next/pos_next/doctype/pos_next_settings/test_pos_next_settings.py
@@ -5,5 +5,5 @@
 from frappe.tests.utils import FrappeTestCase
 
 
-class TestPOSSettings(FrappeTestCase):
+class TestPOSNextSettings(FrappeTestCase):
 	pass
diff --git a/pos_next/pos_next/doctype/wallet/wallet.py b/pos_next/pos_next/doctype/wallet/wallet.py
index 77bc3379..11a5dbc1 100644
--- a/pos_next/pos_next/doctype/wallet/wallet.py
+++ b/pos_next/pos_next/doctype/wallet/wallet.py
@@ -2,10 +2,10 @@
 # For license information, please see license.txt
 
 import frappe
+from erpnext.accounts.utils import get_balance_on
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils import flt
-from erpnext.accounts.utils import get_balance_on
 
 
 class Wallet(Document):
@@ -25,13 +25,14 @@ def validate_duplicate_wallet(self):
 		if not self.is_new():
 			return
 		existing = frappe.db.exists(
-			"Wallet",
-			{"customer": self.customer, "company": self.company, "name": ("!=", self.name)}
+			"Wallet", {"customer": self.customer, "company": self.company, "name": ("!=", self.name)}
 		)
 		if existing:
-			frappe.throw(_("A wallet already exists for customer {0} in company {1}").format(
-				self.customer, self.company
-			))
+			frappe.throw(
+				_("A wallet already exists for customer {0} in company {1}").format(
+					self.customer, self.company
+				)
+			)
 
 	def get_balance(self):
 		"""Get current wallet balance from GL entries.
@@ -43,11 +44,7 @@ def get_balance(self):
 		if not self.account or not self.customer:
 			return 0.0
 
-		balance = get_balance_on(
-			account=self.account,
-			party_type="Customer",
-			party=self.customer
-		)
+		balance = get_balance_on(account=self.account, party_type="Customer", party=self.customer)
 		# Negate because negative receivable balance = positive wallet credit
 		return -flt(balance)
 
@@ -74,10 +71,7 @@ def get_customer_wallet(customer, company=None):
 		filters["company"] = company
 
 	wallet = frappe.db.get_value(
-		"Wallet",
-		filters,
-		["name", "customer", "company", "account", "status"],
-		as_dict=True
+		"Wallet", filters, ["name", "customer", "company", "account", "status"], as_dict=True
 	)
 
 	return wallet
@@ -111,11 +105,7 @@ def get_customer_wallet_balance(customer, company=None, exclude_invoice=None):
 			return 0.0
 
 		# Get balance from GL entries
-		gl_balance = get_balance_on(
-			account=wallet.account,
-			party_type="Customer",
-			party=customer
-		)
+		gl_balance = get_balance_on(account=wallet.account, party_type="Customer", party=customer)
 
 		# Negate because negative receivable balance = positive wallet credit
 		wallet_balance = -flt(gl_balance)
@@ -142,14 +132,10 @@ def get_pending_wallet_payments(customer, exclude_invoice=None):
 		"customer": customer,
 		"docstatus": ["in", [0, 1]],  # Draft or Submitted
 		"outstanding_amount": [">", 0],
-		"is_pos": 1
+		"is_pos": 1,
 	}
 
-	invoices = frappe.get_all(
-		"Sales Invoice",
-		filters=filters,
-		fields=["name"]
-	)
+	invoices = frappe.get_all("Sales Invoice", filters=filters, fields=["name"])
 
 	pending_amount = 0.0
 
@@ -159,15 +145,11 @@ def get_pending_wallet_payments(customer, exclude_invoice=None):
 
 		# Get wallet payments from this invoice
 		payments = frappe.get_all(
-			"Sales Invoice Payment",
-			filters={"parent": invoice.name},
-			fields=["mode_of_payment", "amount"]
+			"Sales Invoice Payment", filters={"parent": invoice.name}, fields=["mode_of_payment", "amount"]
 		)
 
 		for payment in payments:
-			is_wallet = frappe.db.get_value(
-				"Mode of Payment", payment.mode_of_payment, "is_wallet_payment"
-			)
+			is_wallet = frappe.db.get_value("Mode of Payment", payment.mode_of_payment, "is_wallet_payment")
 			if is_wallet:
 				pending_amount += flt(payment.amount)
 
@@ -199,13 +181,15 @@ def create_customer_wallet(customer, company, account=None):
 	if not account:
 		frappe.throw(_("Please configure a default wallet account for company {0}").format(company))
 
-	wallet = frappe.get_doc({
-		"doctype": "Wallet",
-		"customer": customer,
-		"company": company,
-		"account": account,
-		"status": "Active"
-	})
+	wallet = frappe.get_doc(
+		{
+			"doctype": "Wallet",
+			"customer": customer,
+			"company": company,
+			"account": account,
+			"status": "Active",
+		}
+	)
 	wallet.insert(ignore_permissions=True)
 
 	return wallet
@@ -214,11 +198,7 @@ def create_customer_wallet(customer, company, account=None):
 def get_default_wallet_account(company):
 	"""Get default wallet account for a company"""
 	# Try to get from POS Settings
-	wallet_account = frappe.db.get_value(
-		"POS Settings",
-		{"company": company},
-		"wallet_account"
-	)
+	wallet_account = frappe.db.get_value("POS Next Settings", {"company": company}, "wallet_account")
 
 	if wallet_account:
 		return wallet_account
@@ -226,13 +206,8 @@ def get_default_wallet_account(company):
 	# Fallback: Find a receivable account with 'wallet' in the name
 	wallet_account = frappe.db.get_value(
 		"Account",
-		{
-			"company": company,
-			"account_type": "Receivable",
-			"is_group": 0,
-			"name": ["like", "%wallet%"]
-		},
-		"name"
+		{"company": company, "account_type": "Receivable", "is_group": 0, "name": ["like", "%wallet%"]},
+		"name",
 	)
 
 	return wallet_account
@@ -250,7 +225,7 @@ def get_or_create_wallet(customer, company):
 			"customer": wallet_doc.customer,
 			"company": wallet_doc.company,
 			"account": wallet_doc.account,
-			"status": wallet_doc.status
+			"status": wallet_doc.status,
 		}
 
 	return wallet
diff --git a/pos_next/pos_next/workspace/posnext/posnext.json b/pos_next/pos_next/workspace/posnext/posnext.json
index f4000e2e..e638b762 100644
--- a/pos_next/pos_next/workspace/posnext/posnext.json
+++ b/pos_next/pos_next/workspace/posnext/posnext.json
@@ -85,7 +85,7 @@
    "is_query_report": 0,
    "label": "POS Settings",
    "link_count": 0,
-   "link_to": "POS Settings",
+   "link_to": "POS Next Settings",
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
@@ -208,7 +208,7 @@
    "color": "Grey",
    "doc_view": "List",
    "label": "Pos Settings",
-   "link_to": "POS Settings",
+   "link_to": "POS Next Settings",
    "stats_filter": "[]",
    "type": "DocType"
   },
diff --git a/pos_next/services/barcode.py b/pos_next/services/barcode.py
index d59d02ce..e730b687 100644
--- a/pos_next/services/barcode.py
+++ b/pos_next/services/barcode.py
@@ -22,172 +22,173 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import List, TypedDict
+from typing import TypedDict
 
 import frappe
 from erpnext.stock.get_item_details import get_conversion_factor
 
 
 class BarcodeResult(TypedDict, total=False):
-    """Type definition for barcode resolution result."""
+	"""Type definition for barcode resolution result."""
 
-    item_barcode: str  # The barcode from Item Barcodes table
-    integer_value: str  # Integer part of the encoded value
-    decimal_value: str  # Decimal part of the encoded value
-    barcode_type: str  # "Weighted" or "Priced"
-    uom: str | None  # UOM from Item Barcodes table
-    qty: float | None  # Quantity (only for weighted barcodes)
+	item_barcode: str  # The barcode from Item Barcodes table
+	integer_value: str  # Integer part of the encoded value
+	decimal_value: str  # Decimal part of the encoded value
+	barcode_type: str  # "Weighted" or "Priced"
+	uom: str | None  # UOM from Item Barcodes table
+	qty: float | None  # Quantity (only for weighted barcodes)
 
 
 class ResolvedItemData(TypedDict, total=False):
-    """Type definition for resolved item data to be applied to cart."""
+	"""Type definition for resolved item data to be applied to cart."""
 
-    resolved_qty: float | None
-    resolved_uom: str | None
-    resolved_price: float | None
-    resolved_barcode_type: str | None
+	resolved_qty: float | None
+	resolved_uom: str | None
+	resolved_price: float | None
+	resolved_barcode_type: str | None
 
 
 @lru_cache(maxsize=1)
 def is_barcode_resolver_available() -> bool:
-    """
-    Check if the barcode_resolver app is installed.
+	"""
+	Check if the barcode_resolver app is installed.
 
-    Returns:
-        bool: True if barcode_resolver is available, False otherwise.
+	Returns:
+	    bool: True if barcode_resolver is available, False otherwise.
 
-    Note:
-        Result is cached for performance. Server restart clears the cache.
-    """
-    return "barcode_resolver" in frappe.get_installed_apps()
+	Note:
+	    Result is cached for performance. Server restart clears the cache.
+	"""
+	return "barcode_resolver" in frappe.get_installed_apps()
 
 
 def resolve_barcode(barcode: str, pos_profile: str) -> BarcodeResult | None:
-    """
-    Resolve a barcode using the barcode_resolver app if available.
-
-    This function attempts to parse special barcode formats (weighted/priced)
-    using configurable rules from the barcode_resolver app.
-
-    Args:
-        barcode: The barcode string to resolve.
-
-    Returns:
-        BarcodeResult dict if the barcode matches a rule, None otherwise.
-        Also returns None if barcode_resolver app is not installed.
-
-    Example:
-        >>> result = resolve_barcode("2001234001500")
-        >>> if result:
-        ...     print(f"Item: {result['item_barcode']}, Qty: {result['qty']}")
-    """
-    if not is_barcode_resolver_available():
-        return None
-
-    try:
-        from barcode_resolver.barcode_resolver.doctype.barcode_rule.utils import (
-            resolve_barcode as _resolve_barcode,
-        )
-        # get POS Settings
-        pos_settings = frappe.get_doc("POS Settings", {"pos_profile": pos_profile})
-        barcode_rules = [rule.barcode_rule for rule in pos_settings.barcode_rules if not rule.disable]
-        return _resolve_barcode(barcode, barcode_rules)
-    except ImportError:
-        # App might have been uninstalled, clear cache and return None
-        is_barcode_resolver_available.cache_clear()
-        return None
-    except Exception:
-        # Log unexpected errors but don't break POS functionality
-        frappe.log_error(
-            title="Barcode Resolver Error",
-            message=f"Error resolving barcode: {barcode}",
-        )
-        return None
+	"""
+	Resolve a barcode using the barcode_resolver app if available.
+
+	This function attempts to parse special barcode formats (weighted/priced)
+	using configurable rules from the barcode_resolver app.
+
+	Args:
+	    barcode: The barcode string to resolve.
+
+	Returns:
+	    BarcodeResult dict if the barcode matches a rule, None otherwise.
+	    Also returns None if barcode_resolver app is not installed.
+
+	Example:
+	    >>> result = resolve_barcode("2001234001500")
+	    >>> if result:
+	    ...     print(f"Item: {result['item_barcode']}, Qty: {result['qty']}")
+	"""
+	if not is_barcode_resolver_available():
+		return None
+
+	try:
+		from barcode_resolver.barcode_resolver.doctype.barcode_rule.utils import (
+			resolve_barcode as _resolve_barcode,
+		)
+
+		# get POS Settings
+		pos_settings = frappe.get_doc("POS Next Settings", {"pos_profile": pos_profile})
+		barcode_rules = [rule.barcode_rule for rule in pos_settings.barcode_rules if not rule.disable]
+		return _resolve_barcode(barcode, barcode_rules)
+	except ImportError:
+		# App might have been uninstalled, clear cache and return None
+		is_barcode_resolver_available.cache_clear()
+		return None
+	except Exception:
+		# Log unexpected errors but don't break POS functionality
+		frappe.log_error(
+			title="Barcode Resolver Error",
+			message=f"Error resolving barcode: {barcode}",
+		)
+		return None
 
 
 def compute_resolved_item_data(
-    resolved_barcode: BarcodeResult | None,
-    item,
+	resolved_barcode: BarcodeResult | None,
+	item,
 ) -> ResolvedItemData | None:
-    """
-    Compute qty and uom from resolved barcode data.
-
-    For weighted barcodes: uses qty directly from the barcode.
-    For priced barcodes: computes qty = encoded_price / item_rate.
-
-    Args:
-        resolved_barcode: The result from resolve_barcode().
-        item_rate: The item's unit price (required for priced barcodes).
-
-    Returns:
-        ResolvedItemData with resolved_qty, resolved_uom, and resolved_barcode_type,
-        or None if no valid resolution.
-
-    Example:
-        >>> resolved = resolve_barcode("2001234001500")
-        >>> if resolved:
-        ...     item_data = compute_resolved_item_data(resolved, item_rate=10.0)
-        ...     print(f"Qty: {item_data['resolved_qty']}, UOM: {item_data['resolved_uom']}")
-    """
-    if not resolved_barcode or not is_barcode_resolver_available():
-        return None
-
-    from barcode_resolver.barcode_resolver.doctype.barcode_rule.utils import BarcodeTypes
-
-    barcode_type = resolved_barcode.get("barcode_type")
-    barcode_uom = resolved_barcode.get("uom")
-    # If barcode resolver didn't provide a UOM, fall back to item's stock UOM
-    if not barcode_uom:
-        barcode_uom = item.get("uom")
-    uom_prices = item.get("uom_prices", {})
-    barcode_uom_price = uom_prices.get(barcode_uom)
-    item_uom = item.get("uom")
-    item_price = item.get("rate")
-    item_name = item.get("item_code")
-    if item_name is None:
-        frappe.log_error(
-            title="Barcode Resolver Error",
-            message=f"Item code is missing in item data: {item}",
-        )
-        return None
-
-    integer_value = resolved_barcode.get("integer_value", "0")
-    decimal_value = resolved_barcode.get("decimal_value", "0")
-    if barcode_type == BarcodeTypes.WEIGHTED.value:
-        qty = float(f"{integer_value}.{decimal_value}")
-        uom = barcode_uom
-        price = barcode_uom_price
-        if barcode_uom not in uom_prices:
-            conversion_factor = get_conversion_factor(item_name, barcode_uom).get("conversion_factor", 1)
-            qty *= conversion_factor
-            uom = item_uom
-            price = item_price
-
-        return {
-            "resolved_qty": qty,
-            "resolved_uom": uom,
-            "resolved_price": price,
-            "resolved_barcode_type": barcode_type,
-        }
-    elif barcode_type == BarcodeTypes.PRICED.value:
-        encoded_price = float(f"{integer_value}.{decimal_value}")
-        if barcode_uom in uom_prices:
-            barcode_uom_price = uom_prices.get(barcode_uom)
-            price = barcode_uom_price
-            uom = barcode_uom
-            qty = encoded_price / price if price and price > 0 else None
-        else:
-            conversion_factor = get_conversion_factor(item_name, barcode_uom).get("conversion_factor", 1)
-            uom = barcode_uom
-            price = conversion_factor * item_price
-            # Add the calculated price as this barcode_uom price
-            uom_prices[barcode_uom] = price
-            qty = encoded_price / price if price and price > 0 else None
-        return {
-            "resolved_qty": qty,
-            "resolved_uom": uom,
-            "resolved_price": encoded_price,
-            "resolved_barcode_type": barcode_type,
-        }
-
-    return None
+	"""
+	Compute qty and uom from resolved barcode data.
+
+	For weighted barcodes: uses qty directly from the barcode.
+	For priced barcodes: computes qty = encoded_price / item_rate.
+
+	Args:
+	    resolved_barcode: The result from resolve_barcode().
+	    item_rate: The item's unit price (required for priced barcodes).
+
+	Returns:
+	    ResolvedItemData with resolved_qty, resolved_uom, and resolved_barcode_type,
+	    or None if no valid resolution.
+
+	Example:
+	    >>> resolved = resolve_barcode("2001234001500")
+	    >>> if resolved:
+	    ...     item_data = compute_resolved_item_data(resolved, item_rate=10.0)
+	    ...     print(f"Qty: {item_data['resolved_qty']}, UOM: {item_data['resolved_uom']}")
+	"""
+	if not resolved_barcode or not is_barcode_resolver_available():
+		return None
+
+	from barcode_resolver.barcode_resolver.doctype.barcode_rule.utils import BarcodeTypes
+
+	barcode_type = resolved_barcode.get("barcode_type")
+	barcode_uom = resolved_barcode.get("uom")
+	# If barcode resolver didn't provide a UOM, fall back to item's stock UOM
+	if not barcode_uom:
+		barcode_uom = item.get("uom")
+	uom_prices = item.get("uom_prices", {})
+	barcode_uom_price = uom_prices.get(barcode_uom)
+	item_uom = item.get("uom")
+	item_price = item.get("rate")
+	item_name = item.get("item_code")
+	if item_name is None:
+		frappe.log_error(
+			title="Barcode Resolver Error",
+			message=f"Item code is missing in item data: {item}",
+		)
+		return None
+
+	integer_value = resolved_barcode.get("integer_value", "0")
+	decimal_value = resolved_barcode.get("decimal_value", "0")
+	if barcode_type == BarcodeTypes.WEIGHTED.value:
+		qty = float(f"{integer_value}.{decimal_value}")
+		uom = barcode_uom
+		price = barcode_uom_price
+		if barcode_uom not in uom_prices:
+			conversion_factor = get_conversion_factor(item_name, barcode_uom).get("conversion_factor", 1)
+			qty *= conversion_factor
+			uom = item_uom
+			price = item_price
+
+		return {
+			"resolved_qty": qty,
+			"resolved_uom": uom,
+			"resolved_price": price,
+			"resolved_barcode_type": barcode_type,
+		}
+	elif barcode_type == BarcodeTypes.PRICED.value:
+		encoded_price = float(f"{integer_value}.{decimal_value}")
+		if barcode_uom in uom_prices:
+			barcode_uom_price = uom_prices.get(barcode_uom)
+			price = barcode_uom_price
+			uom = barcode_uom
+			qty = encoded_price / price if price and price > 0 else None
+		else:
+			conversion_factor = get_conversion_factor(item_name, barcode_uom).get("conversion_factor", 1)
+			uom = barcode_uom
+			price = conversion_factor * item_price
+			# Add the calculated price as this barcode_uom price
+			uom_prices[barcode_uom] = price
+			qty = encoded_price / price if price and price > 0 else None
+		return {
+			"resolved_qty": qty,
+			"resolved_uom": uom,
+			"resolved_price": encoded_price,
+			"resolved_barcode_type": barcode_type,
+		}
+
+	return None