nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 23:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stock): scope over deliver/receive role check to delivery and receipt overflow

Browse Source 
(cherry picked from commit 248873034d)

# Conflicts:
#	erpnext/controllers/status_updater.py
This commit is contained in:
Afsal Syed
2026-08-02 02:31:36 +05:30
committed by Sudharsanan11
parent 7be8a99a23
commit 328c72da18
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/status_updater.py
View File

@@ -312,6 +312,7 @@ class StatusUpdater(Document):
qty_or_amount, qty_or_amount,
) )
<<<<<<< HEAD
role_allowed_to_over_deliver_receive = frappe.db.get_single_value( role_allowed_to_over_deliver_receive = frappe.db.get_single_value(
"Stock Settings", "role_allowed_to_over_deliver_receive" "Stock Settings", "role_allowed_to_over_deliver_receive"
) )
@@ -319,6 +320,14 @@ class StatusUpdater(Document):
"Accounts Settings", "role_allowed_to_over_bill" "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 = 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 = ( overflow_percent = (
(item[args["target_field"]] - item[args["target_ref_field"]]) / item[args["target_ref_field"]] (item[args["target_field"]] - item[args["target_ref_field"]]) / item[args["target_ref_field"]]