feat(expenses): enhance shift expense management and validation

- Introduced computed properties for shift expense totals and remaining allowances in ExpenseDialog.
- Updated validation logic to check against remaining shift expense allowance instead of maximum expense amount.
- Modified API to return shift expense totals and remaining amounts for better expense tracking.
- Enhanced translations to reflect new shift expense limit messages and summaries.

Author: MohamedAliSmk

POS/src/components/sale/ExpenseDialog.vue

@@ -56,7 +56,7 @@
 						v-if="maximumExpenseAmount > 0"
 						class="mt-1 text-xs text-gray-500 text-start"
 					>
-						{{ __("Maximum allowed: {0}", [formatCurrency(maximumExpenseAmount)]) }}
+						{{ shiftExpenseLimitSummary }}
 					</p>
 				</div>
 
@@ -179,6 +179,35 @@ const maximumExpenseAmount = computed(
 		0,
 )
 
+const shiftExpenseTotal = computed(
+	() => Number.parseFloat(dialogDataResource.data?.shift_expense_total) || 0,
+)
+
+const remainingExpenseAmount = computed(() => {
+	if (maximumExpenseAmount.value <= 0) {
+		return 0
+	}
+
+	const remaining = Number.parseFloat(dialogDataResource.data?.remaining_expense_amount)
+	if (Number.isFinite(remaining)) {
+		return Math.max(0, remaining)
+	}
+
+	return Math.max(0, maximumExpenseAmount.value - shiftExpenseTotal.value)
+})
+
+const shiftExpenseLimitSummary = computed(() => {
+	if (maximumExpenseAmount.value <= 0) {
+		return ""
+	}
+
+	return [
+		__("Shift limit: {0}", { 0: formatCurrency(maximumExpenseAmount.value) }),
+		__("Recorded: {0}", { 0: formatCurrency(shiftExpenseTotal.value) }),
+		__("Remaining: {0}", { 0: formatCurrency(remainingExpenseAmount.value) }),
+	].join(" | ")
+})
+
 const dialogDataResource = createResource({
 	url: "pos_next.api.expenses.get_expense_dialog_data",
 	makeParams() {
@@ -288,10 +317,10 @@ function validateForm() {
 		return __("Amount must be greater than zero")
 	}
 
-	if (maximumExpenseAmount.value > 0 && amount > maximumExpenseAmount.value) {
-		return __("Amount exceeds the maximum allowed expense amount of {0}", [
-			formatCurrency(maximumExpenseAmount.value),
-		])
+	if (maximumExpenseAmount.value > 0 && amount > remainingExpenseAmount.value) {
+		return __("Amount exceeds the remaining shift expense allowance of {0}", {
+			0: formatCurrency(remainingExpenseAmount.value),
+		})
 	}
 
 	if (!form.mode_of_payment) {

pos_next/api/expenses.py

@@ -21,6 +21,10 @@ def get_expense_dialog_data(pos_profile, pos_opening_shift):
 	maximum_expense_amount = flt(
 		frappe.db.get_value("POS Profile", pos_profile, "posa_maximum_expense_amount")
 	)
+	shift_expense_total = get_shift_expense_total(pos_opening_shift)
+	remaining_expense_amount = _get_remaining_shift_expense_amount(
+		maximum_expense_amount, shift_expense_total
+	)
 
 	from pos_next.api.pos_profile import get_payment_methods
 
@@ -29,6 +33,8 @@ def get_expense_dialog_data(pos_profile, pos_opening_shift):
 		"payment_methods": get_payment_methods(pos_profile),
 		"employees": get_active_employees(company),
 		"maximum_expense_amount": maximum_expense_amount,
+		"shift_expense_total": shift_expense_total,
+		"remaining_expense_amount": remaining_expense_amount,
 	}
 
 
@@ -49,7 +55,7 @@ def create_pos_expense(
 
 	validate_pos_expense_enabled(pos_profile)
 	shift = validate_open_shift(pos_opening_shift, pos_profile)
-	validate_expense_amount(amount, pos_profile)
+	validate_expense_amount(amount, pos_profile, pos_opening_shift)
 	validate_expense_account(expense_account, shift.company)
 	validate_mode_of_payment(mode_of_payment, pos_profile, shift.company)
 	if employee:
@@ -118,23 +124,57 @@ def validate_open_shift(pos_opening_shift, pos_profile):
 	return shift
 
 
-def validate_expense_amount(amount, pos_profile):
+def validate_expense_amount(amount, pos_profile, pos_opening_shift=None):
 	if flt(amount) <= 0:
 		frappe.throw(_("Amount must be greater than zero"))
 
 	maximum_amount = flt(
 		frappe.db.get_value("POS Profile", pos_profile, "posa_maximum_expense_amount")
 	)
-	if maximum_amount > 0 and flt(amount) > maximum_amount:
+	if maximum_amount <= 0:
+		return
+
+	shift_total = get_shift_expense_total(pos_opening_shift) if pos_opening_shift else 0
+	new_shift_total = shift_total + flt(amount)
+	if new_shift_total > maximum_amount:
+		remaining = _get_remaining_shift_expense_amount(maximum_amount, shift_total)
 		frappe.throw(
-			_("Amount {0} exceeds the maximum allowed expense amount of {1}").format(
-				frappe.format_value(amount, {"fieldtype": "Currency"}),
+			_(
+				"This expense would exceed the shift expense limit of {0}. "
+				"Expenses recorded this shift: {1}. Remaining allowance: {2}"
+			).format(
 				frappe.format_value(maximum_amount, {"fieldtype": "Currency"}),
+				frappe.format_value(shift_total, {"fieldtype": "Currency"}),
+				frappe.format_value(remaining, {"fieldtype": "Currency"}),
 			),
-			title=_("Maximum Expense Amount Exceeded"),
+			title=_("Shift Expense Limit Exceeded"),
 		)
 
 
+def get_shift_expense_total(pos_opening_shift):
+	"""Return the total submitted POS expense amount for an opening shift."""
+	if not pos_opening_shift:
+		return 0
+
+	total = frappe.db.sql(
+		"""
+		SELECT COALESCE(SUM(posa_expense_amount), 0)
+		FROM `tabJournal Entry`
+		WHERE posa_is_pos_expense = 1
+		  AND posa_pos_opening_shift = %s
+		  AND docstatus = 1
+		""",
+		pos_opening_shift,
+	)
+	return flt(total[0][0] if total else 0)
+
+
+def _get_remaining_shift_expense_amount(maximum_amount, shift_expense_total):
+	if flt(maximum_amount) <= 0:
+		return 0
+	return max(0, flt(maximum_amount) - flt(shift_expense_total))
+
+
 def validate_expense_account(expense_account, company):
 	if not expense_account:
 		frappe.throw(_("Expense Account is required"))

pos_next/api/test_expenses.py

@@ -69,14 +69,40 @@ def test_validate_expense_amount_rejects_zero(self, mock_get_value, _mock_throw)
 
 	@patch("pos_next.api.expenses.frappe.throw", side_effect=_raise_runtime_error)
 	@patch("pos_next.api.expenses.frappe.format_value", side_effect=lambda value, _options: str(value))
+	@patch("pos_next.api.expenses.get_shift_expense_total", return_value=0)
 	@patch("pos_next.api.expenses.frappe.db.get_value")
-	def test_validate_expense_amount_rejects_over_maximum(
-		self, mock_get_value, _mock_format, _mock_throw
+	def test_validate_expense_amount_rejects_over_shift_limit(
+		self, mock_get_value, _mock_shift_total, _mock_format, _mock_throw
 	):
 		mock_get_value.return_value = 100
 
-		with self.assertRaisesRegex(RuntimeError, "exceeds the maximum"):
-			expenses.validate_expense_amount(150, "Test POS Profile")
+		with self.assertRaisesRegex(RuntimeError, "shift expense limit"):
+			expenses.validate_expense_amount(150, "Test POS Profile", "POS-OS-0001")
+
+	@patch("pos_next.api.expenses.frappe.throw", side_effect=_raise_runtime_error)
+	@patch("pos_next.api.expenses.frappe.format_value", side_effect=lambda value, _options: str(value))
+	@patch("pos_next.api.expenses.get_shift_expense_total", return_value=80)
+	@patch("pos_next.api.expenses.frappe.db.get_value")
+	def test_validate_expense_amount_rejects_when_cumulative_exceeds_limit(
+		self, mock_get_value, _mock_shift_total, _mock_format, _mock_throw
+	):
+		mock_get_value.return_value = 100
+
+		with self.assertRaisesRegex(RuntimeError, "shift expense limit"):
+			expenses.validate_expense_amount(30, "Test POS Profile", "POS-OS-0001")
+
+	@patch("pos_next.api.expenses.frappe.db.sql", return_value=((80,),))
+	def test_get_shift_expense_total_sums_submitted_journal_entries(self, mock_sql):
+		total = expenses.get_shift_expense_total("POS-OS-0001")
+
+		self.assertEqual(total, 80)
+		mock_sql.assert_called_once()
+
+	@patch("pos_next.api.expenses.get_shift_expense_total", return_value=0)
+	def test_get_remaining_shift_expense_amount(self, _mock_shift_total):
+		self.assertEqual(expenses._get_remaining_shift_expense_amount(100, 30), 70)
+		self.assertEqual(expenses._get_remaining_shift_expense_amount(100, 120), 0)
+		self.assertEqual(expenses._get_remaining_shift_expense_amount(0, 50), 0)
 
 	@patch("pos_next.api.expenses.frappe.throw", side_effect=_raise_runtime_error)
 	@patch("pos_next.api.expenses.frappe.db.get_value")

pos_next/pos_next/custom/pos_profile.json

@@ -334,7 +334,7 @@
    "creation": "2026-06-14 10:00:00.000000",
    "default": null,
    "depends_on": "eval:doc.posa_allow_pos_expense",
-   "description": "Maximum amount a cashier can spend in a single POS Expense transaction",
+   "description": "Maximum total POS Expense amount allowed per shift session",
    "docstatus": 0,
    "dt": "POS Profile",
    "fetch_from": null,

pos_next/translations/ar.csv

@@ -1580,6 +1580,12 @@ Points applied: {0}. Please pay remaining {1} with {2},تم خصم النقاط:
 "Expense Account is required","حساب المصروف مطلوب",""
 "Amount must be greater than zero","يجب أن يكون المبلغ أكبر من صفر",""
 "Amount exceeds the maximum allowed expense amount of {0}","المبلغ يتجاوز الحد الأقصى المسموح للمصروف {0}",""
+"Amount exceeds the remaining shift expense allowance of {0}","المبلغ يتجاوز المسموح المتبقي لمصروفات الوردية وهو {0}",""
+"Shift limit: {0}","حد الوردية: {0}",""
+"Recorded: {0}","المسجل: {0}",""
+"Remaining: {0}","المتبقي: {0}",""
+"This expense would exceed the shift expense limit of {0}. Expenses recorded this shift: {1}. Remaining allowance: {2}","سيؤدي هذا المصروف إلى تجاوز حد مصروفات الوردية البالغ {0}. المصروفات المسجلة في هذه الوردية: {1}. المسموح المتبقي: {2}",""
+"Shift Expense Limit Exceeded","تم تجاوز حد مصروفات الوردية",""
 "Mode of Payment is required","طريقة الدفع مطلوبة",""
 "POS Expenses","مصروفات نقطة البيع",""
 "{0} expenses","{0} مصروفات",""

pos_next/translations/id.csv

@@ -1494,3 +1494,9 @@
 "{0} units available in ""{1}""","{0} unit tersedia di ""{1}""",""
 "{0} updated","{0} diperbarui",""
 "{0}%","{0}%",""
+"Shift limit: {0}","Batas shift: {0}",""
+"Recorded: {0}","Tercatat: {0}",""
+"Remaining: {0}","Sisa: {0}",""
+"Amount exceeds the remaining shift expense allowance of {0}","Jumlah melebihi sisa tunjangan pengeluaran shift sebesar {0}",""
+"This expense would exceed the shift expense limit of {0}. Expenses recorded this shift: {1}. Remaining allowance: {2}","Pengeluaran ini akan melebihi batas pengeluaran shift sebesar {0}. Pengeluaran yang tercatat pada shift ini: {1}. Sisa tunjangan: {2}",""
+"Shift Expense Limit Exceeded","Batas Pengeluaran Shift Terlampaui",""

pos_next/translations/pt-br.csv

@@ -1515,3 +1515,9 @@
 "variants","variantes",""
 "{0} updated","{0} atualizado",""
 "{0}%","{0}%",""
+"Shift limit: {0}","Limite do turno: {0}",""
+"Recorded: {0}","Registrado: {0}",""
+"Remaining: {0}","Restante: {0}",""
+"Amount exceeds the remaining shift expense allowance of {0}","O valor excede a margem restante de despesas do turno de {0}",""
+"This expense would exceed the shift expense limit of {0}. Expenses recorded this shift: {1}. Remaining allowance: {2}","Esta despesa excederia o limite de despesas do turno de {0}. Despesas registradas neste turno: {1}. Margem restante: {2}",""
+"Shift Expense Limit Exceeded","Limite de Despesa do Turno Excedido",""