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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-06-12 16:51:57 +05:30
committed by GitHub
parent 0fea93388d
commit d04965b6b2
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@@ -324,13 +324,9 @@ def get_status_color(status):
@frappe.whitelist()
<<<<<<< HEAD
def get_raw_materials(job_card):
=======
def get_raw_materials(job_card: str):
frappe.has_permission("Job Card", "read", doc=job_card, throw=True)
>>>>>>> cf127e8900 (fix: permissions in workstation file)
raw_materials = frappe.get_all(
"Job Card",
fields=[
@@ -567,13 +563,9 @@ def update_job_card(job_card: str, method: str, **kwargs):
@frappe.whitelist()
<<<<<<< HEAD
def validate_job_card(job_card, status):
=======
def validate_job_card(job_card: str, status: str):
frappe.has_permission("Job Card", "read", doc=job_card, throw=True)
>>>>>>> cf127e8900 (fix: permissions in workstation file)
job_card_details = frappe.db.get_value("Job Card", job_card, ["status", "for_quantity"], as_dict=1)
current_status = job_card_details.status