nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-26 05:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-06-08 20:05:46 +05:30
committed by GitHub
parent c9a5b0026e
commit b617f1302d
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -1256,13 +1256,10 @@ class JobCard(Document):
@frappe.whitelist() @frappe.whitelist()
def pause_job(self, **kwargs): def pause_job(self, **kwargs):
<<<<<<< HEAD
=======
frappe.has_permission("Job Card", "write", doc=self, throw=True) frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus() self.validate_docstatus()
>>>>>>> 8db1eb0d27 (fix: allow specific methods to run)
if isinstance(kwargs, dict): if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs) kwargs = frappe._dict(kwargs)
@@ -1271,13 +1268,10 @@ class JobCard(Document):
@frappe.whitelist() @frappe.whitelist()
def resume_job(self, **kwargs): def resume_job(self, **kwargs):
<<<<<<< HEAD
=======
frappe.has_permission("Job Card", "write", doc=self, throw=True) frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus() self.validate_docstatus()
>>>>>>> 8db1eb0d27 (fix: allow specific methods to run)
if isinstance(kwargs, dict): if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs) kwargs = frappe._dict(kwargs)
@@ -1450,13 +1444,9 @@ class JobCard(Document):
@frappe.whitelist() @frappe.whitelist()
def start_timer(self, **kwargs): def start_timer(self, **kwargs):
<<<<<<< HEAD
=======
frappe.has_permission("Job Card", "write", doc=self, throw=True) frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus() self.validate_docstatus()
>>>>>>> 8db1eb0d27 (fix: allow specific methods to run)
if isinstance(kwargs, dict): if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs) kwargs = frappe._dict(kwargs)
@@ -1468,13 +1458,10 @@ class JobCard(Document):
@frappe.whitelist() @frappe.whitelist()
def complete_job_card(self, **kwargs): def complete_job_card(self, **kwargs):
<<<<<<< HEAD
if isinstance(kwargs, dict): if isinstance(kwargs, dict):
kwargs = frappe._dict(kwargs) kwargs = frappe._dict(kwargs)
=======
frappe.has_permission("Job Card", "write", doc=self, throw=True) frappe.has_permission("Job Card", "write", doc=self, throw=True)
self.validate_docstatus() self.validate_docstatus()
if isinstance(kwargs, dict): if isinstance(kwargs, dict):