From 60a270acd45f80783dcfc0240b64af6101e11a78 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 9 Jun 2026 14:56:39 +0530 Subject: [PATCH] chore: fix conflicts Removed validation for completed quantity matching in job card. --- erpnext/manufacturing/doctype/job_card/job_card.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 5e709a64a59..7cede957590 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -864,11 +864,8 @@ class JobCard(Document): ) ) -<<<<<<< HEAD -======= self.validate_not_on_hold() self.validate_time_logs_present() - self.validate_completed_qty_matches_for_quantity() def validate_not_on_hold(self): if self.is_paused: @@ -880,7 +877,6 @@ class JobCard(Document): ) def validate_time_logs_present(self): ->>>>>>> 9c23229cbf (fix: don't allow to submit job card with hold status) if not self.time_logs: frappe.throw( _("Time logs are required for {0} {1}").format(