From b617f1302dab7b59f0b6067b4985e0b60fbbf66e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 8 Jun 2026 20:05:46 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/manufacturing/doctype/job_card/job_card.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 538ad939ae6..cb54b32a6e7 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -1256,13 +1256,10 @@ class JobCard(Document): @frappe.whitelist() def pause_job(self, **kwargs): -<<<<<<< HEAD -======= frappe.has_permission("Job Card", "write", doc=self, throw=True) self.validate_docstatus() ->>>>>>> 8db1eb0d27 (fix: allow specific methods to run) if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) @@ -1271,13 +1268,10 @@ class JobCard(Document): @frappe.whitelist() def resume_job(self, **kwargs): -<<<<<<< HEAD -======= frappe.has_permission("Job Card", "write", doc=self, throw=True) self.validate_docstatus() ->>>>>>> 8db1eb0d27 (fix: allow specific methods to run) if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) @@ -1450,13 +1444,9 @@ class JobCard(Document): @frappe.whitelist() def start_timer(self, **kwargs): -<<<<<<< HEAD -======= frappe.has_permission("Job Card", "write", doc=self, throw=True) - self.validate_docstatus() ->>>>>>> 8db1eb0d27 (fix: allow specific methods to run) if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) @@ -1468,13 +1458,10 @@ class JobCard(Document): @frappe.whitelist() def complete_job_card(self, **kwargs): -<<<<<<< HEAD if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) -======= frappe.has_permission("Job Card", "write", doc=self, throw=True) - self.validate_docstatus() if isinstance(kwargs, dict):