From 328c72da188d25d2a3e2df7675e1b30469ff0179 Mon Sep 17 00:00:00 2001 From: Afsal Syed Date: Sun, 2 Aug 2026 02:31:36 +0530 Subject: [PATCH] fix(stock): scope over deliver/receive role check to delivery and receipt overflow (cherry picked from commit 248873034df67a2953ef7948ddc44d28f202ea97) # Conflicts: # erpnext/controllers/status_updater.py --- erpnext/controllers/status_updater.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 05011a6b9d9..6513ecf7080 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -312,6 +312,7 @@ class StatusUpdater(Document): qty_or_amount, ) +<<<<<<< HEAD role_allowed_to_over_deliver_receive = frappe.db.get_single_value( "Stock Settings", "role_allowed_to_over_deliver_receive" ) @@ -319,6 +320,14 @@ class StatusUpdater(Document): "Accounts Settings", "role_allowed_to_over_bill" ) role = role_allowed_to_over_deliver_receive if qty_or_amount == "qty" else role_allowed_to_over_bill +======= + role = None + if qty_or_amount == "qty": + if args.get("overflow_type") in ("delivery", "receipt"): + role = frappe.get_single_value("Stock Settings", "role_allowed_to_over_deliver_receive") + else: + role = frappe.get_single_value("Accounts Settings", "role_allowed_to_over_bill") +>>>>>>> 248873034d (fix(stock): scope over deliver/receive role check to delivery and receipt overflow) overflow_percent = ( (item[args["target_field"]] - item[args["target_ref_field"]]) / item[args["target_ref_field"]]