From 3d1327cfe54d683968c95a7a4685e1f5f04172f8 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 8 Jun 2026 20:06:44 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/manufacturing/doctype/job_card/job_card.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index cb54b32a6e7..50d1a043c46 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -1485,7 +1485,6 @@ class JobCard(Document): frappe.throw(_("Submitted Job Card cannot be processed.")) def validate_complete_job_card_qty(self, kwargs): ->>>>>>> 8db1eb0d27 (fix: allow specific methods to run) if flt(kwargs.pending_qty) and flt(kwargs.pending_qty) < 0: frappe.throw(_("Pending quantity cannot be negative."))