From 7ab59aa09422cfc327228e9c83678c6118007730 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sat, 31 Jan 2026 20:25:00 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/status_updater.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 1115381b10f..048ef72b46c 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -341,12 +341,6 @@ class StatusUpdater(Document): ): return -<<<<<<< HEAD - if qty_or_amount == "qty": - action_msg = _( - 'To allow over receipt / delivery, update "Over Receipt/Delivery Allowance" in Stock Settings or the Item.' - ) -======= if args["source_dt"] != "Pick List Item" and args["target_dt"] != "Quotation Item": if qty_or_amount == "qty": action_msg = _( @@ -356,11 +350,8 @@ class StatusUpdater(Document): action_msg = _( 'To allow over billing, update "Over Billing Allowance" in Accounts Settings or the Item.' ) ->>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation) else: - action_msg = _( - 'To allow over billing, update "Over Billing Allowance" in Accounts Settings or the Item.' - ) + action_msg = None frappe.throw( _(